vr: fix backup router health check

[shwstppr]

Description

Fixes #4163

Added excluded tests in the code for BACKUP router.

Types of changes

• Breaking change (fix or feature that would cause existing functionality to change)
• New feature (non-breaking change which adds functionality)
• Bug fix (non-breaking change which fixes an issue)
• Enhancement (improves an existing feature and functionality)
• Cleanup (Code refactoring and cleanup, that may add test cases)

Screenshots (if appropriate):

BACKUP Router,

Before fix,

After fix and excluding gateways_check.py for BACKUP router,

How Has This Been Tested?

Executing health checks for BACKUP router

[shwstppr]

@Doni7722 @rhtyd please have a look

[yadvr]

@blueorangutan package

[blueorangutan]

@rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

[blueorangutan]

Packaging result: ✔centos7 ✔debian. JID-1448

[Doni7722]

@shwstppr LGTM - Does it check the state of the Router on every health check (as the state could change anytime)?

[shwstppr]

@Doni7722 createMonitorServiceCommand, where the exclusion has been added, is the method used to create command which will be sent to the host for running health. This will be called every time health checks run for a router. State is checked from DomainRouterVO which should hold the correct state even if it has been changed.

cloudstack/server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java

Line 1628 in a838a14

private SetMonitorServiceCommand createMonitorServiceCommand(DomainRouterVO router, List<MonitorServiceTO> services,

cloudstack/server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java

Lines 1652 to 1691 in a838a14

	private boolean updateRouterHealthChecksConfig(DomainRouterVO router) {
	if (!RouterHealthChecksEnabled.value()) {
	return false;
	}
	SetMonitorServiceCommand command = createMonitorServiceCommand(router, null,true, true);
	String controlIP = getRouterControlIP(router);
	if (StringUtils.isBlank(controlIP) || controlIP.equals("0.0.0.0")) {
	s_logger.debug("Skipping update data on router " + router.getUuid() + " because controlIp is not correct.");
	return false;
	}
	s_logger.info("Updating data for router health checks for router " + router.getUuid());
	Answer origAnswer = null;
	try {
	origAnswer = _agentMgr.easySend(router.getHostId(), command);
	} catch (final Exception e) {
	s_logger.error("Error while sending update data for health check to router: " + router.getInstanceName(), e);
	return false;
	}
	if (origAnswer == null) {
	s_logger.error("Unable to update health checks data to router " + router.getHostName());
	return false;
	}
	GroupAnswer answer = null;
	if (origAnswer instanceof GroupAnswer) {
	answer = (GroupAnswer) origAnswer;
	} else {
	s_logger.error("Unable to update health checks data to router " + router.getHostName() + " Received answer " + origAnswer.getDetails());
	return false;
	}
	if (!answer.getResult()) {
	s_logger.error("Unable to update health checks data to router " + router.getHostName() + ", details : " + answer.getDetails());
	}
	return answer.getResult();
	}

@blueorangutan test

[blueorangutan]

@shwstppr a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests

[blueorangutan]

Trillian test result (tid-1840)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 35412 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr4171-t1840-kvm-centos7.zip
Smoke tests completed. 83 look OK, 0 have error(s)
Only failed tests results shown below:

Test	Result	Time (s)	Test File

[yadvr]

Minor issue rest lgtm