SO Failed Robot Health Check

There were several issues.  The wrong jackson provider was being selected,
which caused the exception, so we fixed that. Then we discovered that a
a URN mapping was missing, so we added that.  Then we found that the
healthcheck wouldn't work because it's trying to check the default
process engine, which does not exist.  We commented out that part of
the healthcheck to be able to resolve this high priority issue.  A
new low priority issue will need to be created to follow up.

Change-Id: I327612a147333eeecd44915942cecd13959c4717
Issue-id: SO-139
Signed-off-by: Rob Daugherty <rd472p@att.com>

6 files changed, 37 insertions, 13 deletions

diff --git a/adapters/mso-catalog-db-adapter/WebContent/WEB-INF/jboss-deployment-structure.xml b/adapters/mso-catalog-db-adapter/WebContent/WEB-INF/jboss-deployment-structure.xml
index 05f0a32844..53bdbc9ea7 100644
--- a/adapters/mso-catalog-db-adapter/WebContent/WEB-INF/jboss-deployment-structure.xml
+++ b/adapters/mso-catalog-db-adapter/WebContent/WEB-INF/jboss-deployment-structure.xml
@@ -5,12 +5,17 @@
 			<module name="org.apache.log4j" />
 			<module name="org.slf4j" />
 			<module name="org.slf4j.impl" />
+			<module name="org.jboss.resteasy.resteasy-jackson-provider" />
+			<module name="org.jboss.resteasy.resteasy-jettison-provider" />
 		</exclusions>
 		<dependencies>
 			<module name="org.jboss.jandex" slot="main" />
 			<module name="org.javassist" slot="main" />
 			<module name="org.antlr" slot="main" />
 			<module name="org.dom4j" slot="main" />
+			<module name="org.jboss.resteasy.resteasy-jackson2-provider" services="import" />
+			<!-- This module contain the ProviderBase class: -->
+			<module name="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider" export="true" />
 		</dependencies>
 	</deployment>
 </jboss-deployment-structure>
diff --git a/adapters/mso-network-adapter/WebContent/WEB-INF/jboss-deployment-structure.xml b/adapters/mso-network-adapter/WebContent/WEB-INF/jboss-deployment-structure.xml
index 58ddb4a08f..fb268917f2 100644
--- a/adapters/mso-network-adapter/WebContent/WEB-INF/jboss-deployment-structure.xml
+++ b/adapters/mso-network-adapter/WebContent/WEB-INF/jboss-deployment-structure.xml
@@ -5,12 +5,17 @@
 			<module name="org.apache.log4j" />

 			<module name="org.slf4j" />

 			<module name="org.slf4j.impl" />

+			<module name="org.jboss.resteasy.resteasy-jackson-provider" />

+			<module name="org.jboss.resteasy.resteasy-jettison-provider" />

 		</exclusions>

 		<dependencies>

 			    <module name="org.jboss.jandex" slot="main" />

                 <module name="org.javassist" slot="main" />

                 <module name="org.antlr" slot="main" />

                 <module name="org.dom4j" slot="main" />

+                <module name="org.jboss.resteasy.resteasy-jackson2-provider" services="import" />

+                <!-- This module contain the ProviderBase class: -->

+                <module name="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider" export="true" />

 		</dependencies>

 	</deployment>

-</jboss-deployment-structure>
\ No newline at end of file
+</jboss-deployment-structure>

diff --git a/adapters/mso-vnf-adapter/WebContent/WEB-INF/jboss-deployment-structure.xml b/adapters/mso-vnf-adapter/WebContent/WEB-INF/jboss-deployment-structure.xml
index 58ddb4a08f..56e2023f04 100644
--- a/adapters/mso-vnf-adapter/WebContent/WEB-INF/jboss-deployment-structure.xml
+++ b/adapters/mso-vnf-adapter/WebContent/WEB-INF/jboss-deployment-structure.xml
@@ -5,12 +5,17 @@
 			<module name="org.apache.log4j" />

 			<module name="org.slf4j" />

 			<module name="org.slf4j.impl" />

+			<module name="org.jboss.resteasy.resteasy-jackson-provider" />

+			<module name="org.jboss.resteasy.resteasy-jettison-provider" />

 		</exclusions>

 		<dependencies>

 			    <module name="org.jboss.jandex" slot="main" />

                 <module name="org.javassist" slot="main" />

                 <module name="org.antlr" slot="main" />

                 <module name="org.dom4j" slot="main" />

-		</dependencies>

+                <module name="org.jboss.resteasy.resteasy-jackson2-provider" services="import" />

+                <!-- This module contain the ProviderBase class: -->

+                <module name="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider" export="true" />

+                </dependencies>

 	</deployment>

-</jboss-deployment-structure>
\ No newline at end of file
+</jboss-deployment-structure>

diff --git a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/HealthCheckHandler.java b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/HealthCheckHandler.java
index 55f6221dfb..75858b14ec 100644
--- a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/HealthCheckHandler.java
+++ b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/HealthCheckHandler.java
@@ -54,8 +54,8 @@ public class HealthCheckHandler  {
 
     private static MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL);
     private static final String SITENAME = "mso.sitename";
-    private static final String ADPTER_ENDPOINT = "mso.openecomp.adapters.db.endpoint";
-    private static final String OPENECOMP_ADAPTER_NAMESPACE = "mso.openecomp.adapter.namespace";
+    private static final String ADAPTER_ENDPOINT = "mso.adapters.db.endpoint";
+    private static final String ADAPTER_NAMESPACE = "mso.adapters.namespace";
     private static final String CONFIG = "mso.bpmn.urn.properties";
     private static final String CREDENTIAL = "mso.adapters.db.auth";
     private static final String MSOKEY = "mso.msoKey";
@@ -94,17 +94,17 @@ public class HealthCheckHandler  {
         }
 
         String siteName = props.get(SITENAME);
-        String endpoint = props.get(ADPTER_ENDPOINT);
+        String endpoint = props.get(ADAPTER_ENDPOINT);
 
         if (null == siteName || siteName.length () == 0 || null == endpoint || endpoint.length () == 0) {
 
-            msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.DataError, "Unable to load key attributes (" + SITENAME + " or " + ADPTER_ENDPOINT + ") from the config file:" + CONFIG);
+            msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.DataError, "Unable to load key attributes (" + SITENAME + " or " + ADAPTER_ENDPOINT + ") from the config file:" + CONFIG);
 
             return NOT_STARTED_RESPONSE;
         }
 
         try {
-            if (!this.getSiteStatus (endpoint, siteName, props.get(CREDENTIAL), props.get(MSOKEY), props.get(OPENECOMP_ADAPTER_NAMESPACE))) {
+            if (!this.getSiteStatus (endpoint, siteName, props.get(CREDENTIAL), props.get(MSOKEY), props.get(ADAPTER_NAMESPACE))) {
                 msoLogger.debug("This site is currently disabled for maintenance.");
                 return HEALTH_CHECK_NOK_RESPONSE;
             }
@@ -146,17 +146,17 @@ public class HealthCheckHandler  {
         }
 
         String siteName = props.get(SITENAME);
-        String endpoint = props.get(ADPTER_ENDPOINT);
+        String endpoint = props.get(ADAPTER_ENDPOINT);
 
         if (null == siteName || siteName.length () == 0 || null == endpoint || endpoint.length () == 0) {
 
-            msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.DataError, "Unable to load key attributes (" + SITENAME + " or " + ADPTER_ENDPOINT + ") from the config file:" + CONFIG);
+            msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.DataError, "Unable to load key attributes (" + SITENAME + " or " + ADAPTER_ENDPOINT + ") from the config file:" + CONFIG);
 
             return NOT_STARTED_RESPONSE;
         }
 
         try {
-            if (!this.getSiteStatus (endpoint, siteName, props.get(CREDENTIAL), props.get(MSOKEY), props.get(OPENECOMP_ADAPTER_NAMESPACE))) {
+            if (!this.getSiteStatus (endpoint, siteName, props.get(CREDENTIAL), props.get(MSOKEY), props.get(ADAPTER_NAMESPACE))) {
                 msoLogger.debug("This site is currently disabled for maintenance.");
                 return HEALTH_CHECK_NOK_RESPONSE;
             }
@@ -169,7 +169,8 @@ public class HealthCheckHandler  {
         }
 
         try {
-        	ProcessEngines.getDefaultProcessEngine().getIdentityService().createGroupQuery().list();
+        	// TODO: check the appropriate process engine
+        	// ProcessEngines.getDefaultProcessEngine().getIdentityService().createGroupQuery().list();
         } catch (final Exception e) {
 
             msoLogger.error(MessageEnum.GENERAL_EXCEPTION_ARG, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "Exception while verifying Camunda engine", e);
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/webapp/WEB-INF/jboss-deployment-structure.xml b/bpmn/MSOInfrastructureBPMN/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
index 3dbfcce36f..fa35eadba8 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
+++ b/bpmn/MSOInfrastructureBPMN/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
@@ -25,7 +25,14 @@
 			<module name="org.apache.log4j" />

 			<module name="org.slf4j" />

 			<module name="org.slf4j.impl" />

+			<module name="org.jboss.resteasy.resteasy-jackson-provider" />

+			<module name="org.jboss.resteasy.resteasy-jettison-provider" />

 		</exclusions>

+		<dependencies>

+			<module name="org.jboss.resteasy.resteasy-jackson2-provider" services="import" />

+			<!-- This module contain the ProviderBase class: -->

+			<module name="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider" export="true" />

+		</dependencies>

 	</deployment>

 </jboss-deployment-structure>

 

diff --git a/packages/arquillian-unit-tests/src/test/resources/docker/mso/mso-docker.json b/packages/arquillian-unit-tests/src/test/resources/docker/mso/mso-docker.json
index 0b2c7aa807..5552efe6a5 100644
--- a/packages/arquillian-unit-tests/src/test/resources/docker/mso/mso-docker.json
+++ b/packages/arquillian-unit-tests/src/test/resources/docker/mso/mso-docker.json
@@ -169,6 +169,7 @@
             "logDebugUpdateNetworkInstanceInfra": "false",
             "aaiEndpoint": "http://mso:8080/aai-emul",
             "adaptersCompletemsoprocessEndpoint": "http://mso:8080/CompleteMsoProcess",
+            "adaptersNamespace": "http://org.openecomp.mso",
             "adaptersDbEndpoint": "http://mso:8080/dbadapters/RequestsDbAdapter",
             "adaptersSdncEndpoint": "http://mso:8080/adapters/SDNCAdapter",
             "adaptersTenantEndpoint": "http://mso:8080/tenants/TenantAdapter",
@@ -217,4 +218,4 @@
     {
         "mso-config": "~> 1.0.0"
     }
-}
\ No newline at end of file
+}