summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Smokowski <ss835w@att.com>2019-05-31 15:36:42 +0000
committerGerrit Code Review <gerrit@onap.org>2019-05-31 15:36:42 +0000
commitec71f01963e4c5c70d11f41842c7cd9cfd38316d (patch)
tree24d60565b42ceadd23e7a362b8b6a140b8344ebb
parent556967d308d5fa239323b27c4d517198e838573b (diff)
parentfa0319edeb5ce5dcb0120bef53c52e1ef4c14fa5 (diff)
Merge "Renamed NF fields in catalog db pojo"
-rw-r--r--asdc-controller/src/main/java/org/onap/so/asdc/installer/heat/ToscaResourceInstaller.java12
-rw-r--r--mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/ConfigurationResourceCustomization.java34
2 files changed, 23 insertions, 23 deletions
diff --git a/asdc-controller/src/main/java/org/onap/so/asdc/installer/heat/ToscaResourceInstaller.java b/asdc-controller/src/main/java/org/onap/so/asdc/installer/heat/ToscaResourceInstaller.java
index edf8ff338c..486697b0b2 100644
--- a/asdc-controller/src/main/java/org/onap/so/asdc/installer/heat/ToscaResourceInstaller.java
+++ b/asdc-controller/src/main/java/org/onap/so/asdc/installer/heat/ToscaResourceInstaller.java
@@ -696,12 +696,12 @@ public class ToscaResourceInstaller {
.setModelCustomizationUUID(metadata.getValue(SdcPropertyNames.PROPERTY_NAME_CUSTOMIZATIONUUID));
configCustomizationResource.setModelInstanceName(nodeTemplate.getName());
- configCustomizationResource.setNfFunction(toscaResourceStructure.getSdcCsarHelper()
- .getNodeTemplatePropertyLeafValue(nodeTemplate, SdcPropertyNames.PROPERTY_NAME_NFFUNCTION));
- configCustomizationResource.setNfRole(toscaResourceStructure.getSdcCsarHelper()
- .getNodeTemplatePropertyLeafValue(nodeTemplate, SdcPropertyNames.PROPERTY_NAME_NFROLE));
- configCustomizationResource.setNfType(toscaResourceStructure.getSdcCsarHelper()
- .getNodeTemplatePropertyLeafValue(nodeTemplate, SdcPropertyNames.PROPERTY_NAME_NFTYPE));
+ configCustomizationResource.setFunction(
+ toscaResourceStructure.getSdcCsarHelper().getNodeTemplatePropertyLeafValue(nodeTemplate, "function"));
+ configCustomizationResource.setRole(
+ toscaResourceStructure.getSdcCsarHelper().getNodeTemplatePropertyLeafValue(nodeTemplate, "role"));
+ configCustomizationResource.setType(
+ toscaResourceStructure.getSdcCsarHelper().getNodeTemplatePropertyLeafValue(nodeTemplate, "type"));
configCustomizationResource
.setServiceProxyResourceCustomizationUUID(spResourceCustomization.getModelCustomizationUUID());
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/ConfigurationResourceCustomization.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/ConfigurationResourceCustomization.java
index 4599c978ec..278417c5c8 100644
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/ConfigurationResourceCustomization.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/ConfigurationResourceCustomization.java
@@ -64,13 +64,13 @@ public class ConfigurationResourceCustomization implements Serializable {
private String modelInstanceName;
@Column(name = "CONFIGURATION_FUNCTION")
- private String nfFunction;
+ private String function;
@Column(name = "CONFIGURATION_TYPE")
- private String nfType;
+ private String type;
@Column(name = "CONFIGURATION_ROLE")
- private String nfRole;
+ private String role;
@Column(name = "CREATION_TIMESTAMP", updatable = false)
@Temporal(TemporalType.TIMESTAMP)
@@ -120,28 +120,28 @@ public class ConfigurationResourceCustomization implements Serializable {
this.modelInstanceName = modelInstanceName;
}
- public String getNfFunction() {
- return nfFunction;
+ public String getFunction() {
+ return function;
}
- public void setNfFunction(String nfFunction) {
- this.nfFunction = nfFunction;
+ public void setFunction(String function) {
+ this.function = function;
}
- public String getNfType() {
- return nfType;
+ public String getType() {
+ return type;
}
- public void setNfType(String nfType) {
- this.nfType = nfType;
+ public void setType(String type) {
+ this.type = type;
}
- public String getNfRole() {
- return nfRole;
+ public String getRole() {
+ return role;
}
- public void setNfRole(String nfRole) {
- this.nfRole = nfRole;
+ public void setRole(String role) {
+ this.role = role;
}
public Date getCreated() {
@@ -186,8 +186,8 @@ public class ConfigurationResourceCustomization implements Serializable {
@Override
public String toString() {
return new ToStringBuilder(this).append("id", id).append("modelCustomizationUUID", modelCustomizationUUID)
- .append("modelInstanceName", modelInstanceName).append("nfFunction", nfFunction)
- .append("nfType", nfType).append("nfRole", nfRole).append("created", created)
+ .append("modelInstanceName", modelInstanceName).append("function", function).append("type", type)
+ .append("role", role).append("created", created)
// .append("serviceProxyResourceCustomization", serviceProxyResourceCustomization)
.append("configResourceCustomization", configResourceCustomization)
.append("configurationResource", configurationResource).append("service", service).toString();