1 files changed, 244 insertions, 252 deletions
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/switchover/detector/SwitchoverDetector.java b/catalog-be/src/main/java/org/openecomp/sdc/be/switchover/detector/SwitchoverDetector.java
index faebb7614b..fb5710cc20 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/switchover/detector/SwitchoverDetector.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/switchover/detector/SwitchoverDetector.java
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,6 +20,19 @@
 
 package org.openecomp.sdc.be.switchover.detector;
 
+import org.apache.commons.codec.binary.Base64;
+import org.apache.http.entity.ContentType;
+import org.apache.http.entity.StringEntity;
+import org.openecomp.sdc.be.config.BeEcompErrorManager;
+import org.openecomp.sdc.be.config.Configuration.SwitchoverDetectorConfig;
+import org.openecomp.sdc.be.config.ConfigurationManager;
+import org.openecomp.sdc.common.http.client.api.HttpRequest;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
 import java.net.InetAddress;
 import java.util.Properties;
 import java.util.concurrent.ExecutorService;
@@ -29,293 +42,272 @@ import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.TimeUnit;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-
-import org.apache.commons.codec.binary.Base64;
-import org.openecomp.sdc.be.config.BeEcompErrorManager;
-import org.openecomp.sdc.be.config.Configuration.SwitchoverDetectorConfig;
-import org.openecomp.sdc.be.config.ConfigurationManager;
-import org.openecomp.sdc.be.dao.rest.HttpRestClient;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
-
 @Component("switchover-detector")
 public class SwitchoverDetector {
 
-	protected static String SWITCHOVER_DETECTOR_LOG_CONTEXT = "switchover.detector";
+    protected static String SWITCHOVER_DETECTOR_LOG_CONTEXT = "switchover.detector";
 
-	private static Logger switchoverLogger = LoggerFactory.getLogger(SWITCHOVER_DETECTOR_LOG_CONTEXT);
+    private static final Logger switchoverLogger = LoggerFactory.getLogger(SWITCHOVER_DETECTOR_LOG_CONTEXT);
 
-	private SwitchoverDetectorConfig switchoverDetectorConfig;
+    private SwitchoverDetectorConfig switchoverDetectorConfig;
 
-	private Properties authHeader = null;
+    private Properties authHeader = null;
 
-	private long detectorInterval = 60;
+    private long detectorInterval = 60;
 
-	private int maxBeQueryAttempts = 3;
+    private int maxBeQueryAttempts = 3;
 
-	private int maxFeQueryAttempts = 3;
+    private int maxFeQueryAttempts = 3;
 
-	private Boolean beMatch = null;
+    private Boolean beMatch = null;
 
-	private Boolean feMatch = null;
+    private Boolean feMatch = null;
 
-	private static Logger logger = LoggerFactory.getLogger(SwitchoverDetector.class.getName());
+    private static final Logger logger = LoggerFactory.getLogger(SwitchoverDetector.class);
 
-	private volatile String siteMode = SwitchoverDetectorState.UNKNOWN.getState();
+    private volatile String siteMode = SwitchoverDetectorState.UNKNOWN.getState();
 
-	private ScheduledFuture<?> scheduledFuture = null;
+    private ScheduledFuture<?> scheduledFuture = null;
 
-	ScheduledExecutorService switchoverDetectorScheduler = Executors.newSingleThreadScheduledExecutor(new ThreadFactory() {
-		@Override
-		public Thread newThread(Runnable r) {
-			return new Thread(r, "Switchover-Detector-Task");
-		}
-	});
+    ScheduledExecutorService switchoverDetectorScheduler = Executors.newSingleThreadScheduledExecutor(new ThreadFactory() {
+        @Override
+        public Thread newThread(Runnable r) {
+            return new Thread(r, "Switchover-Detector-Task");
+        }
+    });
 
-	SwitchoverDetectorScheduledTask switchoverDetectorScheduledTask = null;
+    SwitchoverDetectorScheduledTask switchoverDetectorScheduledTask = null;
 
-	public enum SwitchoverDetectorState {
+    public enum SwitchoverDetectorState {
 
-		UNKNOWN("unknown"), ACTIVE("active"), STANDBY("standby");
+        UNKNOWN("unknown"), ACTIVE("active"), STANDBY("standby");
 
-		private String state;
+        private String state;
 
-		SwitchoverDetectorState(String state) {
-			this.state = state;
-		}
+        SwitchoverDetectorState(String state) {
+            this.state = state;
+        }
 
-		public String getState() {
-			return state;
-		}
-	}
+        public String getState() {
+            return state;
+        }
+    }
 
-	public enum SwitchoverDetectorGroup {
+    public enum SwitchoverDetectorGroup {
 
-		BE_SET("beSet"), FE_SET("feSet");
+        BE_SET("beSet"), FE_SET("feSet");
 
-		private String group;
+        private String group;
 
-		SwitchoverDetectorGroup(String group) {
-			this.group = group;
-		}
+        SwitchoverDetectorGroup(String group) {
+            this.group = group;
+        }
 
-		public String getGroup() {
-			return group;
-		}
-	}
+        public String getGroup() {
+            return group;
+        }
+    }
 
-	public String getSiteMode() {
-		return siteMode;
-	}
+    public String getSiteMode() {
+        return siteMode;
+    }
 
-	public void setSiteMode(String mode) {
-		this.siteMode = mode;
-	}
+    public void setSiteMode(String mode) {
+        this.siteMode = mode;
+    }
 
-	private Boolean queryBe() {
-		return queryGss(switchoverDetectorConfig.getgBeFqdn(), switchoverDetectorConfig.getBeVip(), maxBeQueryAttempts);
-	}
+    private Boolean queryBe() {
+        return queryGss(switchoverDetectorConfig.getgBeFqdn(), switchoverDetectorConfig.getBeVip(), maxBeQueryAttempts);
+    }
 
-	private Boolean queryFe() {
-		return queryGss(switchoverDetectorConfig.getgFeFqdn(), switchoverDetectorConfig.getFeVip(), maxFeQueryAttempts);
-	}
+    private Boolean queryFe() {
+        return queryGss(switchoverDetectorConfig.getgFeFqdn(), switchoverDetectorConfig.getFeVip(), maxFeQueryAttempts);
+    }
 
-	private void setAuthorizationProperties() {
-		String userInfo = switchoverDetectorConfig.getChangePriorityUser() + ":" + switchoverDetectorConfig.getChangePriorityPassword();
-		String auth = "Basic " + new String(new Base64().encode(userInfo.getBytes()));
-		authHeader = new Properties();
-		authHeader.put("Authorization", auth);
-	}
+    private void setAuthorizationProperties() {
+        String userInfo = switchoverDetectorConfig.getChangePriorityUser() + ":" + switchoverDetectorConfig.getChangePriorityPassword();
+        String auth = "Basic " + new String(new Base64().encode(userInfo.getBytes()));
+        authHeader = new Properties();
+        authHeader.put("Authorization", auth);
+    }
 
-	private void initializeSiteMode() {
-		while (siteMode == SwitchoverDetectorState.UNKNOWN.getState()) {
+    private void initializeSiteMode() {
+        while (siteMode.equals(SwitchoverDetectorState.UNKNOWN.getState())) {
 
-			beMatch = queryBe();
-			feMatch = queryFe();
+            beMatch = queryBe();
+            feMatch = queryFe();
 
-			if (beMatch == feMatch && beMatch != null) {
-				if (beMatch) {
-					setSiteMode(SwitchoverDetectorState.ACTIVE.getState());
-				} else {
-					setSiteMode(SwitchoverDetectorState.STANDBY.getState());
-				}
-			}
-		}
-	}
+            if (beMatch == feMatch && beMatch != null) {
+                if (beMatch) {
+                    setSiteMode(SwitchoverDetectorState.ACTIVE.getState());
+                } else {
+                    setSiteMode(SwitchoverDetectorState.STANDBY.getState());
+                }
+            }
+        }
+    }
 
-	private Boolean queryGss(String fqdn, String vip, int maxAttempts) {
+    private Boolean queryGss(String fqdn, String vip, int maxAttempts) {
 
-		Boolean result = null;
-		int attempts = 0;
+        Boolean result = null;
+        int attempts = 0;
 
-		while (result == null && (++attempts < maxAttempts)) {
-			try {
-				InetAddress inetAddress = InetAddress.getByName(fqdn);
-				result = inetAddress.getHostAddress().equals(vip);
+        while (result == null && (++attempts < maxAttempts)) {
+            try {
+                InetAddress inetAddress = InetAddress.getByName(fqdn);
+                result = inetAddress.getHostAddress().equals(vip);
 
-			} catch (Exception e) {
-				String message = e.getMessage();
-				if (message == null) {
-					message = e.getClass().getName();
-				}
-				logger.debug("Error occured during switchover detector query, Result is {}", message, e);
-			}
-		}
-		if (null == result) {
-			BeEcompErrorManager.getInstance().logFqdnResolveError(SWITCHOVER_DETECTOR_LOG_CONTEXT, "host " + fqdn + " not resolved after " + attempts + " attempts");
-		}
-		return result;
-	}
-
-	public class SwitchoverDetectorScheduledTask implements Runnable {
-
-		public SwitchoverDetectorScheduledTask() {
-
-		}
-
-		@Override
-		public void run() {
-			logger.trace("Executing Switchover Detector Task - Start");
-
-			initializeSiteMode();
-
-			Boolean beRes = queryBe();
-			Boolean feRes = queryFe();
-
-			if (null == beRes || null == feRes) {
-				return;
-			}
-			
-			Boolean updateRequired = siteMode == SwitchoverDetectorState.STANDBY.getState() && (beRes || feRes) & (beMatch != beRes || feMatch != feRes);
-
-			updateSiteModeAndPriority(beRes && feRes, siteMode == SwitchoverDetectorState.STANDBY.getState(), updateRequired);
-
-			beMatch = beRes;
-			feMatch = feRes;
-		}
-
-		ExecutorService switchoverDetectorExecutor = Executors.newSingleThreadExecutor(new ThreadFactory() {
-			@Override
-			public Thread newThread(Runnable r) {
-				return new Thread(r, "Switchover-Detector-Thread");
-			}
-		});
-
-		private void updateSiteModeAndPriority(Boolean bothMatch, Boolean previousModeStandby, Boolean updateRequired) {
-			if (bothMatch && previousModeStandby) {
-				logger.trace("Site switch over was done. Site is now in active mode");
-				setSiteMode(SwitchoverDetectorState.ACTIVE.getState());
-				BeEcompErrorManager.getInstance().logSiteSwitchoverInfo(SWITCHOVER_DETECTOR_LOG_CONTEXT, siteMode);
-			} else if (!bothMatch && !previousModeStandby) {
-				logger.trace("Site switch over was done. Site is now in stand-by mode");
-				setSiteMode(SwitchoverDetectorState.STANDBY.getState());
-				BeEcompErrorManager.getInstance().logSiteSwitchoverInfo(SWITCHOVER_DETECTOR_LOG_CONTEXT, siteMode);
-			}
-			if (updateRequired) {
-				changeSitePriority(SwitchoverDetectorGroup.BE_SET.getGroup());
-				changeSitePriority(SwitchoverDetectorGroup.FE_SET.getGroup());
-				publishNetwork();
-			}
-		}
-
-		private void changeSitePriority(String groupToSet) {
-
-			String url = switchoverDetectorConfig.getGroups().get(groupToSet).getChangePriorityUrl();
-			String body = switchoverDetectorConfig.getGroups().get(groupToSet).getChangePriorityBody();
-
-			HttpRestClient httpRestClient = new HttpRestClient();
-
-			try {
-				httpRestClient.doPUT(url, authHeader, body);
-
-			} catch (Exception e) {
-				String message = e.getMessage();
-				if (message == null) {
-					message = e.getClass().getName();
-				}
-			
-				logger.debug("Error occured during change site priority request, Result is {}", message, e);
-			}
-
-		}
-
-		private void publishNetwork() {
-
-			String url = switchoverDetectorConfig.getPublishNetworkUrl();
-			String body = switchoverDetectorConfig.getPublishNetworkBody();
-
-			HttpRestClient httpRestClient = new HttpRestClient();
-
-			try {
-				httpRestClient.doPOST(url, authHeader, body);
-
-			} catch (Exception e) {
-				String message = e.getMessage();
-				if (message == null) {
-					message = e.getClass().getName();
-				}
-				
-				logger.debug("Error occured during publish network request, Result is {}", message, e);
-			}
-		}
-
-	}
-
-	@PostConstruct
-	private void init() {
-		logger.info("Enter init method of SwitchoverDetector");
-
-		switchoverDetectorConfig = ConfigurationManager.getConfigurationManager().getConfiguration().getSwitchoverDetector();
-
-		if (!switchoverDetectorConfig.getEnabled()) {
-			logger.info("switchover detector service is disabled");
-			return;
-		}
-
-		Long detectorIntervalConfig = switchoverDetectorConfig.getInterval();
-		if (detectorIntervalConfig != null) {
-			detectorInterval = detectorIntervalConfig.longValue();
-		}
-
-		Integer maxAttempts = switchoverDetectorConfig.getBeResolveAttempts();
-		if (maxAttempts != null) {
-			maxBeQueryAttempts = maxAttempts.intValue();
-		}
-		maxAttempts = switchoverDetectorConfig.getFeResolveAttempts();
-		if (maxAttempts != null) {
-			maxFeQueryAttempts = maxAttempts.intValue();
-		}
-
-		setAuthorizationProperties();
-		logger.info("switchover detector service is enabled, interval is {} seconds", detectorInterval);
-
-		this.switchoverDetectorScheduledTask = new SwitchoverDetectorScheduledTask();
-		startSwitchoverDetectorTask();
-		logger.trace("Exit init method of SwitchoverDetector");
-
-	}
-
-	@PreDestroy
-	private void destroy() {
-
-		if (scheduledFuture != null) {
-			scheduledFuture.cancel(true);
-			scheduledFuture = null;
-		}
-
-		if (switchoverDetectorScheduler != null) {
-			switchoverDetectorScheduler.shutdown();
-		}
-
-	}
-
-	public void startSwitchoverDetectorTask() {
-		if (this.scheduledFuture == null) {
-			this.scheduledFuture = this.switchoverDetectorScheduler.scheduleAtFixedRate(switchoverDetectorScheduledTask, 0, detectorInterval, TimeUnit.SECONDS);
-		}
-	}
+            } catch (Exception e) {
+                String message = e.getMessage();
+                if (message == null) {
+                    message = e.getClass().getName();
+                }
+                logger.debug("Error occured during switchover detector query, Result is {}", message, e);
+            }
+        }
+        if (null == result) {
+            BeEcompErrorManager.getInstance().logFqdnResolveError(SWITCHOVER_DETECTOR_LOG_CONTEXT, "host " + fqdn + " not resolved after " + attempts + " attempts");
+        }
+        return result;
+    }
+
+    public class SwitchoverDetectorScheduledTask implements Runnable {
+
+        public SwitchoverDetectorScheduledTask() {
+
+        }
+
+        @Override
+        public void run() {
+            logger.trace("Executing Switchover Detector Task - Start");
+
+            initializeSiteMode();
+
+            Boolean beRes = queryBe();
+            Boolean feRes = queryFe();
+
+            if (null == beRes || null == feRes) {
+                return;
+            }
+
+            Boolean updateRequired = siteMode == SwitchoverDetectorState.STANDBY.getState() && (beRes || feRes) && (beMatch != beRes || feMatch != feRes);
+
+            updateSiteModeAndPriority(beRes && feRes, siteMode == SwitchoverDetectorState.STANDBY.getState(), updateRequired);
+
+            beMatch = beRes;
+            feMatch = feRes;
+        }
+
+        ExecutorService switchoverDetectorExecutor = Executors.newSingleThreadExecutor(new ThreadFactory() {
+            @Override
+            public Thread newThread(Runnable r) {
+                return new Thread(r, "Switchover-Detector-Thread");
+            }
+        });
+
+        private void updateSiteModeAndPriority(Boolean bothMatch, Boolean previousModeStandby, Boolean updateRequired) {
+            if (bothMatch && previousModeStandby) {
+                logger.trace("Site switch over was done. Site is now in active mode");
+                setSiteMode(SwitchoverDetectorState.ACTIVE.getState());
+                BeEcompErrorManager.getInstance().logSiteSwitchoverInfo(SWITCHOVER_DETECTOR_LOG_CONTEXT, siteMode);
+            } else if (!bothMatch && !previousModeStandby) {
+                logger.trace("Site switch over was done. Site is now in stand-by mode");
+                setSiteMode(SwitchoverDetectorState.STANDBY.getState());
+                BeEcompErrorManager.getInstance().logSiteSwitchoverInfo(SWITCHOVER_DETECTOR_LOG_CONTEXT, siteMode);
+            }
+            if (updateRequired) {
+                changeSitePriority(SwitchoverDetectorGroup.BE_SET.getGroup());
+                changeSitePriority(SwitchoverDetectorGroup.FE_SET.getGroup());
+                publishNetwork();
+            }
+        }
+
+        private void changeSitePriority(String groupToSet) {
+
+            String url = switchoverDetectorConfig.getGroups().get(groupToSet).getChangePriorityUrl();
+            String body = switchoverDetectorConfig.getGroups().get(groupToSet).getChangePriorityBody();
+
+            try {
+                HttpRequest.put(url, authHeader, new StringEntity(body, ContentType.APPLICATION_JSON));
+            } catch (Exception e) {
+                String message = e.getMessage();
+                if (message == null) {
+                    message = e.getClass().getName();
+                }
+                logger.debug("Error occured during change site priority request, Result is {}", message, e);
+            }
+
+        }
+
+        private void publishNetwork() {
+
+            String url = switchoverDetectorConfig.getPublishNetworkUrl();
+            String body = switchoverDetectorConfig.getPublishNetworkBody();
+            try {
+                HttpRequest.post(url, authHeader, new StringEntity(body, ContentType.APPLICATION_JSON));
+            } catch (Exception e) {
+                String message = e.getMessage();
+                if (message == null) {
+                    message = e.getClass().getName();
+                }
+                logger.debug("Error occured during publish network request, Result is {}", message, e);
+            }
+        }
+
+    }
+
+    @PostConstruct
+    private void init() {
+        logger.info("Enter init method of SwitchoverDetector");
+
+        switchoverDetectorConfig = ConfigurationManager.getConfigurationManager().getConfiguration().getSwitchoverDetector();
+
+        if (!switchoverDetectorConfig.getEnabled()) {
+            logger.info("switchover detector service is disabled");
+            return;
+        }
+
+        Long detectorIntervalConfig = switchoverDetectorConfig.getInterval();
+        if (detectorIntervalConfig != null) {
+            detectorInterval = detectorIntervalConfig.longValue();
+        }
+
+        Integer maxAttempts = switchoverDetectorConfig.getBeResolveAttempts();
+        if (maxAttempts != null) {
+            maxBeQueryAttempts = maxAttempts.intValue();
+        }
+        maxAttempts = switchoverDetectorConfig.getFeResolveAttempts();
+        if (maxAttempts != null) {
+            maxFeQueryAttempts = maxAttempts.intValue();
+        }
+
+        setAuthorizationProperties();
+        logger.info("switchover detector service is enabled, interval is {} seconds", detectorInterval);
+
+        this.switchoverDetectorScheduledTask = new SwitchoverDetectorScheduledTask();
+        startSwitchoverDetectorTask();
+        logger.trace("Exit init method of SwitchoverDetector");
+
+    }
+
+    @PreDestroy
+    private void destroy() {
+
+        if (scheduledFuture != null) {
+            scheduledFuture.cancel(true);
+            scheduledFuture = null;
+        }
+
+        if (switchoverDetectorScheduler != null) {
+            switchoverDetectorScheduler.shutdown();
+        }
+
+    }
+
+    public void startSwitchoverDetectorTask() {
+        if (this.scheduledFuture == null) {
+            this.scheduledFuture = this.switchoverDetectorScheduler.scheduleAtFixedRate(switchoverDetectorScheduledTask, 0, detectorInterval, TimeUnit.SECONDS);
+        }
+    }
 
 }