summaryrefslogtreecommitdiffstats
path: root/catalog-be/src/main/java
diff options
context:
space:
mode:
authorml636r <ml6364@att.com>2018-04-17 12:48:56 +0300
committerIdan Amit <ia096e@intl.att.com>2018-04-17 11:32:46 +0000
commit757ca27473fd4d713db46fd281ce3f14cb7949d6 (patch)
treee1d80c06c5ac8c0cb87f160cce2f2c8463499751 /catalog-be/src/main/java
parentbfbe2c38fd1a5e85c2b30a4217015492d586caa2 (diff)
fix miss match in the notification
align the object sent from sdc for distribution with the one in distribution client revert resourceType to resoucreType exclude DMAPP DE and DCAE from failing the health check align the ready probe to check for 200 insted of 500 in FE and BE Change-Id: I1e03660b1e6aded4b6c0cb19fcffe9a821679316 Issue-ID: SDC-1238 Signed-off-by: ml636r <ml6364@att.com>
Diffstat (limited to 'catalog-be/src/main/java')
-rw-r--r--catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/JsonContainerResourceInstance.java12
1 files changed, 6 insertions, 6 deletions
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/JsonContainerResourceInstance.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/JsonContainerResourceInstance.java
index db0e1e938d..9c478e7d9b 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/JsonContainerResourceInstance.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/JsonContainerResourceInstance.java
@@ -28,7 +28,7 @@ public class JsonContainerResourceInstance {
private String resourceInstanceName;
private String resourceName;
private String resourceVersion;
- private String resourceType;
+ private String resoucreType;
private String resourceUUID;
private String resourceInvariantUUID;
private String resourceCustomizationUUID;
@@ -41,7 +41,7 @@ public class JsonContainerResourceInstance {
this.resourceInstanceName = resourceInstance.getName();
this.resourceName = resourceInstance.getComponentName();
this.resourceVersion = resourceInstance.getComponentVersion();
- this.resourceType = resourceType;
+ this.resoucreType = resourceType;
this.resourceUUID = resourceInstance.getComponentUid();
this.artifacts = artifacts;
this.resourceCustomizationUUID = resourceInstance.getCustomizationUUID();
@@ -53,7 +53,7 @@ public class JsonContainerResourceInstance {
this.resourceName = resourceInstance.getComponentName();
this.resourceVersion = resourceInstance.getComponentVersion();
if(resourceInstance.getOriginType() != null)
- this.resourceType = resourceInstance.getOriginType().getValue();
+ this.resoucreType = resourceInstance.getOriginType().getValue();
this.resourceUUID = resourceInstance.getComponentUid();
this.artifacts = artifacts;
this.resourceCustomizationUUID = resourceInstance.getCustomizationUUID();
@@ -84,11 +84,11 @@ public class JsonContainerResourceInstance {
}
public String getResoucreType() {
- return resourceType;
+ return resoucreType;
}
public void setResoucreType(String resoucreType) {
- this.resourceType = resoucreType;
+ this.resoucreType = resoucreType;
}
public String getResourceUUID() {
@@ -141,7 +141,7 @@ public class JsonContainerResourceInstance {
@Override
public String toString() {
- return "JsonContainerResourceInstance [resourceInstanceName=" + resourceInstanceName + ", resourceName=" + resourceName + ", resourceVersion=" + resourceVersion + ", resoucreType=" + resourceType + ", resourceUUID=" + resourceUUID
+ return "JsonContainerResourceInstance [resourceInstanceName=" + resourceInstanceName + ", resourceName=" + resourceName + ", resourceVersion=" + resourceVersion + ", resoucreType=" + resoucreType + ", resourceUUID=" + resourceUUID
+ ", resourceInvariantUUID=" + resourceInvariantUUID + ", resourceCustomizationUUID=" + resourceCustomizationUUID + ", category=" + category + ", subcategory=" + subcategory + ", artifacts=" + artifacts + "]";
}