aboutsummaryrefslogtreecommitdiffstats
path: root/mso-catalog-db/src/main/java/org
diff options
context:
space:
mode:
authorc00149107 <chenchuanyu@huawei.com>2018-03-06 16:34:59 +0800
committerc00149107 <chenchuanyu@huawei.com>2018-03-06 16:34:59 +0800
commitb8566c560b21c595525e5bcba855c8632a8cd9db (patch)
tree31d45de23307c7b06ed4671723ce6201211b4e6e /mso-catalog-db/src/main/java/org
parent789ab7c48502a3c5a59db93a7abf4763a0ba5987 (diff)
Update paramXSD as recipe common field
Update paramXSD as recipe common field Change-Id: I8fe382e65957dc3983abfcb638582bf074875fdb Issue-ID: SO-456 Signed-off-by: c00149107 <chenchuanyu@huawei.com>
Diffstat (limited to 'mso-catalog-db/src/main/java/org')
-rw-r--r--mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/CatalogDatabase.java2
-rw-r--r--mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ArRecipe.java18
-rw-r--r--mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/NetworkRecipe.java10
-rw-r--r--mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/Recipe.java18
-rw-r--r--mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfComponentsRecipe.java10
-rw-r--r--mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfRecipe.java10
6 files changed, 21 insertions, 47 deletions
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/CatalogDatabase.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/CatalogDatabase.java
index 534b5a38c9..f59c09a418 100644
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/CatalogDatabase.java
+++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/CatalogDatabase.java
@@ -4081,7 +4081,7 @@ public class CatalogDatabase implements Closeable {
newVnfRecipe.setDescription(vfRecipe.getDescription());
newVnfRecipe.setOrchestrationUri(vfRecipe.getOrchestrationUri());
newVnfRecipe.setRecipeTimeout(vfRecipe.getRecipeTimeout());
- newVnfRecipe.setVnfComponentParamXSD(vfRecipe.getVnfComponentParamXSD());
+ newVnfRecipe.setParamXSD(vfRecipe.getParamXSD());
newVnfRecipe.setVfModuleModelUUId(newRecipe.getModelUUID());
newVnfRecipe.setVersion(vfRecipe.getVersion());
newVnfRecipe.setVnfComponentType(vfRecipe.getVnfComponentType());
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ArRecipe.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ArRecipe.java
index e7656abb9a..b4c1f0594f 100644
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ArRecipe.java
+++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ArRecipe.java
@@ -26,7 +26,6 @@ import java.io.Serializable;
public class ArRecipe extends Recipe implements Serializable {
private static final long serialVersionUID = 768026109321305392L;
private String modelName;
- private String arParamXSD;
public ArRecipe() {}
public String getModelName() {
@@ -35,28 +34,13 @@ public class ArRecipe extends Recipe implements Serializable {
public void setModelName(String modelName) {
this.modelName = modelName;
}
-
- /**
- * @return Returns the arParamXSD.
- */
- public String getArParamXSD() {
- return arParamXSD;
- }
-
-
- /**
- * @param arParamXSD The arParamXSD to set.
- */
- public void setArParamXSD(String arParamXSD) {
- this.arParamXSD = arParamXSD;
- }
@Override
public String toString () {
StringBuilder sb = new StringBuilder();
sb.append(super.toString());
sb.append(",modelName=").append(modelName);
- sb.append(",arParamXSD=").append(arParamXSD);
+ sb.append(",arParamXSD=").append(getParamXSD());
return sb.toString();
}
}
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/NetworkRecipe.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/NetworkRecipe.java
index f25a99ca2d..4e905b62c8 100644
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/NetworkRecipe.java
+++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/NetworkRecipe.java
@@ -26,7 +26,6 @@ import java.io.Serializable;
public class NetworkRecipe extends Recipe implements Serializable {
private static final long serialVersionUID = 768026109321305392L;
private String modelName;
- private String networkParamXSD;
public NetworkRecipe() {}
public String getModelName() {
@@ -36,19 +35,12 @@ public class NetworkRecipe extends Recipe implements Serializable {
this.modelName = modelName;
}
- public String getNetworkParamXSD() {
- return networkParamXSD;
- }
- public void setNetworkParamXSD(String networkParamXSD) {
- this.networkParamXSD = networkParamXSD;
- }
-
@Override
public String toString () {
StringBuilder sb = new StringBuilder();
sb.append(super.toString());
sb.append(",modelName=").append(modelName);
- sb.append(",networkParamXSD=").append(networkParamXSD);
+ sb.append(",networkParamXSD=").append(getParamXSD());
return sb.toString();
}
}
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/Recipe.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/Recipe.java
index a425c1e96a..58c24412dc 100644
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/Recipe.java
+++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/Recipe.java
@@ -37,7 +37,7 @@ public class Recipe extends MavenLikeVersioning implements Serializable {
protected String orchestrationUri;
private int recipeTimeout;
private String serviceType;
-
+ private String paramXSD;
private Timestamp created;
public Recipe () {
@@ -100,7 +100,21 @@ public class Recipe extends MavenLikeVersioning implements Serializable {
this.created = created;
}
- @Override
+ /**
+ * @return Returns the paramXSD.
+ */
+ public String getParamXSD() {
+ return paramXSD;
+ }
+
+ /**
+ * @param paramXSD The paramXSD to set.
+ */
+ public void setParamXSD(String paramXSD) {
+ this.paramXSD = paramXSD;
+ }
+
+ @Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("RECIPE: ").append(action);
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfComponentsRecipe.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfComponentsRecipe.java
index 8867170ba7..6eac5a23ea 100644
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfComponentsRecipe.java
+++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfComponentsRecipe.java
@@ -27,7 +27,6 @@ public class VnfComponentsRecipe extends Recipe implements Serializable {
private static final long serialVersionUID = 768026109321305392L;
private String vnfType;
- private String vnfComponentParamXSD;
private String vnfComponentType;
private String vfModuleModelUUId;
@@ -39,13 +38,6 @@ public class VnfComponentsRecipe extends Recipe implements Serializable {
public void setVnfType(String vnfType) {
this.vnfType = vnfType;
}
-
- public String getVnfComponentParamXSD() {
- return vnfComponentParamXSD;
- }
- public void setVnfComponentParamXSD(String vnfComponentParamXSD) {
- this.vnfComponentParamXSD = vnfComponentParamXSD;
- }
public String getVnfComponentType() {
return vnfComponentType;
@@ -66,7 +58,7 @@ public class VnfComponentsRecipe extends Recipe implements Serializable {
public String toString () {
StringBuilder sb = new StringBuilder();
sb.append(super.toString());
- sb.append(",vnfComponentParamXSD=").append(vnfComponentParamXSD);
+ sb.append(",vnfComponentParamXSD=").append(getParamXSD());
sb.append(",serviceType=").append(getServiceType());
sb.append(",vnfComponentType=").append(getVnfComponentType());
sb.append(",vfModuleId=").append(getVfModuleModelUUId());
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfRecipe.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfRecipe.java
index 49865e8e9d..46017c2205 100644
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfRecipe.java
+++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfRecipe.java
@@ -27,7 +27,6 @@ public class VnfRecipe extends Recipe implements Serializable {
private static final long serialVersionUID = 768026109321305392L;
private String vnfType;
- private String vnfParamXSD;
private String vfModuleId;
public VnfRecipe() {}
@@ -38,13 +37,6 @@ public class VnfRecipe extends Recipe implements Serializable {
public void setVnfType(String vnfType) {
this.vnfType = vnfType;
}
-
- public String getVnfParamXSD() {
- return vnfParamXSD;
- }
- public void setVnfParamXSD(String vnfParamXSD) {
- this.vnfParamXSD = vnfParamXSD;
- }
public String getVfModuleId() {
return vfModuleId;
@@ -58,7 +50,7 @@ public class VnfRecipe extends Recipe implements Serializable {
public String toString () {
StringBuilder sb = new StringBuilder();
sb.append(super.toString());
- sb.append(",vnfParamXSD=").append(vnfParamXSD);
+ sb.append(",vnfParamXSD=").append(getParamXSD());
sb.append(",serviceType=").append(getServiceType());
sb.append(",vfModuleId=").append(getVfModuleId());
return sb.toString();