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>

5 files changed, 16 insertions, 11 deletions

diff --git a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb
index 6ed6406191..a35896afe6 100644
--- a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb
+++ b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb
@@ -711,4 +711,9 @@ excludedGroupTypesMapping:
     Service:
        - org.openecomp.groups.VfModule
        - org.openecomp.groups.heat.HeatStack
-       - tosca.groups.Root
\ No newline at end of file
+       - tosca.groups.Root
+
+healthStatusExclude:
+   - DE
+   - DMAPP
+   - DCAE
\ No newline at end of file
diff --git a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/ready-probe.sh.erb b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/ready-probe.sh.erb
index 4d8540e956..84d1c6f08f 100644
--- a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/ready-probe.sh.erb
+++ b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/ready-probe.sh.erb
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 health_Check_http_code=$(curl --max-time 5 -o /dev/null -w '%{http_code}' http://127.0.0.1:8080/sdc2/rest/healthCheck)
-if [[ "$health_Check_http_code" -eq 500 ]]; then
+if [[ "$health_Check_http_code" -eq 200 ]]; then
    exit 200
 else
    exit $health_Check_http_code
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 + "]";
     }
 
diff --git a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-configuration.yaml.erb b/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-configuration.yaml.erb
index e4c36ca00b..1a245d24b5 100644
--- a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-configuration.yaml.erb
+++ b/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-configuration.yaml.erb
@@ -109,5 +109,5 @@ kibanaProtocol: http
 
 healthStatusExclude:
    - DE
-   - ES
-   - DMAAP
+   - DMAPP
+   - DCAE
diff --git a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/ready-probe.sh.erb b/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/ready-probe.sh.erb
index d743900892..f721f9a694 100644
--- a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/ready-probe.sh.erb
+++ b/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/ready-probe.sh.erb
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 health_Check_http_code=$(curl --max-time 5 -o /dev/null -w '%{http_code}' http://127.0.0.1:8181/sdc1/rest/healthCheck)
-if [[ "$health_Check_http_code" -eq 500 ]]; then
+if [[ "$health_Check_http_code" -eq 200 ]]; then
    exit 200
 else
    exit $health_Check_http_code