HealthCheck & Namespace Check

Issue-ID: PORTAL-723
Change-Id: I97ac3c592ae1f7a6142384d70ac6038ccee1d8fb
Signed-off-by: statta <statta@research.att.com>

diff --git a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/AppsController.java b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/AppsController.java
index 9feecec..0be0d35 100644 (file)
--- a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/AppsController.java
+++ b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/AppsController.java
@@ -789,7 +789,8 @@ public class AppsController extends EPRestrictedBaseController {
                                EcompPortalUtils.setBadPermissions(user, response, "postOnboardingApps");
                        } else {
                                newOnboardingApp.normalize();
                                EcompPortalUtils.setBadPermissions(user, response, "postOnboardingApps");
                        } else {
                                newOnboardingApp.normalize();

-                               checkIfNameSpaceIsValid(newOnboardingApp, fieldsValidator, response);
+                               if(newOnboardingApp.isCentralAuth != null && newOnboardingApp.isCentralAuth)
+                                       checkIfNameSpaceIsValid(newOnboardingApp, fieldsValidator, response);

                                fieldsValidator = appService.addOnboardingApp(newOnboardingApp, user);
                                response.setStatus(fieldsValidator.httpStatusCode.intValue());
                        }
                                fieldsValidator = appService.addOnboardingApp(newOnboardingApp, user);
                                response.setStatus(fieldsValidator.httpStatusCode.intValue());
                        }

diff --git a/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java b/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java
index 43449b3..2bf10e4 100644 (file)
--- a/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java
+++ b/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java
@@ -297,15 +297,18 @@ public class ExternalAppConfig extends AppConfig implements Configurable {
         * @return New instance of {@link SchedulerFactoryBean}
         */
 
         * @return New instance of {@link SchedulerFactoryBean}
         */
 

-/*     @Bean
+   /*  
+    @Bean

        public EPUebHelper epUebHelper() {
                return new EPUebHelper();
        }
        public EPUebHelper epUebHelper() {
                return new EPUebHelper();
        }

-*/
+

        @Bean
        public HealthMonitor healthMonitor() {
                return new HealthMonitor();
        }
        @Bean
        public HealthMonitor healthMonitor() {
                return new HealthMonitor();
        }

+       */
+       

 
        /**
         * Creates and returns a new instance of a {@link MainUebHandler}.
 
        /**
         * Creates and returns a new instance of a {@link MainUebHandler}.