[VOL-3550] Refactoring AAA statistics names for better consumption
Change-Id: Ie14eaf02b28fee24423792c4d57d7005643334a2
diff --git a/app/src/main/java/org/opencord/aaa/impl/AaaManager.java b/app/src/main/java/org/opencord/aaa/impl/AaaManager.java
index cebf6aa..2f1a7e5 100644
--- a/app/src/main/java/org/opencord/aaa/impl/AaaManager.java
+++ b/app/src/main/java/org/opencord/aaa/impl/AaaManager.java
@@ -568,7 +568,7 @@
sendPacketToSupplicant(eth, stateMachine.supplicantConnectpoint(), true);
aaaStatisticsManager.getAaaStats().increaseChallengeResponsesRx();
outPacketSupp.add(eapPayload.getIdentifier());
- aaaStatisticsManager.getAaaStats().incrementPendingResSupp();
+ aaaStatisticsManager.getAaaStats().incrementPendingReqSupp();
//increasing packets send to server
machineStats.incrementTotalPacketsSent();
machineStats.incrementTotalOctetSent(eapPayload.getLength());
@@ -822,7 +822,7 @@
stateMachine.setSupplicantAddress(srcMac);
stateMachine.start();
- aaaStatisticsManager.getAaaStats().incrementEapolStartReqTrans();
+ aaaStatisticsManager.getAaaStats().incrementEapolStartReqRx();
//send an EAP Request/Identify to the supplicant
EAP eapPayload = new EAP(EAP.REQUEST, stateMachine.identifier(), EAP.ATTR_IDENTITY, null);
if (ethPkt.getVlanID() != Ethernet.VLAN_UNTAGGED) {
@@ -892,6 +892,7 @@
sendRadiusPacket(radiusPayload, inPacket);
stateMachine.setWaitingForRadiusResponse(true);
+ aaaStatisticsManager.getAaaStats().incrementRadiusReqIdTx();
aaaStatisticsManager.getAaaStats().incrementEapolAtrrIdentity();
// change the state to "PENDING"
if (stateMachine.state() == StateMachine.STATE_PENDING) {
@@ -902,12 +903,12 @@
stateMachine.requestAccess();
break;
case EAP.ATTR_MD5:
- stateMachine.setLastPacketReceivedTime(System.currentTimeMillis());
log.debug("EAP packet: EAPOL_PACKET ATTR_MD5 from dev/port: {}/{} with MacAddress {}",
deviceId, portNumber, srcMac);
// verify if the EAP identifier corresponds to the
// challenge identifier from the client state
// machine.
+ stateMachine.setLastPacketReceivedTime(System.currentTimeMillis());
if (eapPacket.getIdentifier() == stateMachine.challengeIdentifier()) {
//send the RADIUS challenge response
radiusPayload = getRadiusPayload(stateMachine,
@@ -920,7 +921,7 @@
}
radiusPayload.addMessageAuthenticator(radiusSecret);
if (outPacketSupp.contains(eapPacket.getIdentifier())) {
- aaaStatisticsManager.getAaaStats().decrementPendingResSupp();
+ aaaStatisticsManager.getAaaStats().decrementPendingReqSupp();
outPacketSupp.remove(identifier);
}
if (log.isTraceEnabled()) {
@@ -929,6 +930,7 @@
}
sendRadiusPacket(radiusPayload, inPacket);
stateMachine.setWaitingForRadiusResponse(true);
+ aaaStatisticsManager.getAaaStats().incrementRadiusReqChallengeTx();
aaaStatisticsManager.getAaaStats().incrementEapolMd5RspChall();
}
break;
@@ -946,7 +948,7 @@
stateMachine.setRequestAuthenticator(radiusPayload.generateAuthCode());
radiusPayload.addMessageAuthenticator(radiusSecret);
if (outPacketSupp.contains(eapPacket.getIdentifier())) {
- aaaStatisticsManager.getAaaStats().decrementPendingResSupp();
+ aaaStatisticsManager.getAaaStats().decrementPendingReqSupp();
outPacketSupp.remove(identifier);
}
if (log.isTraceEnabled()) {
@@ -955,6 +957,7 @@
}
sendRadiusPacket(radiusPayload, inPacket);
stateMachine.setWaitingForRadiusResponse(true);
+ aaaStatisticsManager.getAaaStats().incrementRadiusReqChallengeTx();
aaaStatisticsManager.getAaaStats().incrementEapolTlsRespChall();
if (stateMachine.state() != StateMachine.STATE_PENDING) {
diff --git a/app/src/test/java/org/opencord/aaa/impl/AaaStatisticsTest.java b/app/src/test/java/org/opencord/aaa/impl/AaaStatisticsTest.java
index 0c11292..4ace459 100644
--- a/app/src/test/java/org/opencord/aaa/impl/AaaStatisticsTest.java
+++ b/app/src/test/java/org/opencord/aaa/impl/AaaStatisticsTest.java
@@ -317,17 +317,17 @@
//Check for increase of Stats
assertNotEquals(aaaStatisticsManager.getAaaStats().getEapolResIdentityMsgTrans(), ZERO);
- assertNotEquals(aaaStatisticsManager.getAaaStats().getEapolAuthSuccessTrans(), ZERO);
- assertNotEquals(aaaStatisticsManager.getAaaStats().getEapolStartReqTrans(), ZERO);
+ assertNotEquals(aaaStatisticsManager.getAaaStats().getEapolAuthSuccessTx(), ZERO);
+ assertNotEquals(aaaStatisticsManager.getAaaStats().getEapolStartReqRx(), ZERO);
assertNotEquals(aaaStatisticsManager.getAaaStats().getEapolTransRespNotNak(), ZERO);
- assertNotEquals(aaaStatisticsManager.getAaaStats().getEapPktTxauthChooseEap(), ZERO);
- assertNotEquals(aaaStatisticsManager.getAaaStats().getValidEapolFramesRx(), ZERO);
+ assertNotEquals(aaaStatisticsManager.getAaaStats().getEapolChallengeReqTx(), ZERO);
+ assertNotEquals(aaaStatisticsManager.getAaaStats().getEapolValidFramesRx(), ZERO);
assertNotEquals(aaaStatisticsManager.getAaaStats().getEapolFramesTx(), ZERO);
- assertNotEquals(aaaStatisticsManager.getAaaStats().getReqEapFramesTx(), ZERO);
- assertNotEquals(aaaStatisticsManager.getAaaStats().getRequestIdFramesTx(), ZERO);
+ assertNotEquals(aaaStatisticsManager.getAaaStats().getEapolReqFramesTx(), ZERO);
+ assertNotEquals(aaaStatisticsManager.getAaaStats().getEapolIdRequestFramesTx(), ZERO);
assertEquals(aaaStatisticsManager.getAaaStats().getInvalidBodyLength(), ZERO);
assertEquals(aaaStatisticsManager.getAaaStats().getInvalidPktType(), ZERO);
- assertEquals(aaaStatisticsManager.getAaaStats().getPendingResSupp(), ZERO);
+ assertEquals(aaaStatisticsManager.getAaaStats().getEapolPendingReq(), ZERO);
// Counts the aaa Statistics count and displays in the log
countAaaStatistics();
});
@@ -408,7 +408,7 @@
assertAfter(ASSERTION_DELAY, ASSERTION_LENGTH, () -> {
//Statistic Should be increased.
- assertNotEquals(aaaStatisticsManager.getAaaStats().getPendingResSupp(), ZERO);
+ assertNotEquals(aaaStatisticsManager.getAaaStats().getEapolPendingReq(), ZERO);
//Test if packet with invalid eapol type recieved.
// Supplicant ASF Packet
@@ -418,8 +418,8 @@
//Statistic Should be increased.
assertAfter(ASSERTION_DELAY, ASSERTION_LENGTH, () -> {
assertNotEquals(aaaStatisticsManager.getAaaStats().getInvalidPktType(), ZERO);
- assertNotEquals(aaaStatisticsManager.getAaaStats().getAccessRequestsTx(), ZERO);
- assertNotEquals(aaaStatisticsManager.getAaaStats().getChallengeResponsesRx(), ZERO);
+ assertNotEquals(aaaStatisticsManager.getAaaStats().getRadiusAccessRequestsTx(), ZERO);
+ assertNotEquals(aaaStatisticsManager.getAaaStats().getRadiusChallengeResponsesRx(), ZERO);
assertNotEquals(aaaStatisticsManager.getAaaStats().getDroppedResponsesRx(), ZERO);
assertNotEquals(aaaStatisticsManager.getAaaStats().getInvalidValidatorsRx(), ZERO);
// Counts the aaa Statistics count and displays in the log
@@ -516,16 +516,16 @@
//Check for increase of Stats
assertNotEquals(aaaStatisticsManager.getAaaStats().getEapolResIdentityMsgTrans(), ZERO);
- assertNotEquals(aaaStatisticsManager.getAaaStats().getEapolAuthFailureTrans(), ZERO);
- assertNotEquals(aaaStatisticsManager.getAaaStats().getEapolStartReqTrans(), ZERO);
- assertNotEquals(aaaStatisticsManager.getAaaStats().getEapPktTxauthChooseEap(), ZERO);
+ assertNotEquals(aaaStatisticsManager.getAaaStats().getEapolAuthFailureTx(), ZERO);
+ assertNotEquals(aaaStatisticsManager.getAaaStats().getEapolStartReqRx(), ZERO);
+ assertNotEquals(aaaStatisticsManager.getAaaStats().getEapolChallengeReqTx(), ZERO);
assertNotEquals(aaaStatisticsManager.getAaaStats().getEapolTransRespNotNak(), ZERO);
- assertNotEquals(aaaStatisticsManager.getAaaStats().getAccessRequestsTx(), ZERO);
- assertNotEquals(aaaStatisticsManager.getAaaStats().getChallengeResponsesRx(), ZERO);
+ assertNotEquals(aaaStatisticsManager.getAaaStats().getRadiusAccessRequestsTx(), ZERO);
+ assertNotEquals(aaaStatisticsManager.getAaaStats().getRadiusChallengeResponsesRx(), ZERO);
assertNotEquals(aaaStatisticsManager.getAaaStats().getDroppedResponsesRx(), ZERO);
assertNotEquals(aaaStatisticsManager.getAaaStats().getInvalidValidatorsRx(), ZERO);
- assertNotEquals(aaaStatisticsManager.getAaaStats().getRejectResponsesRx(), ZERO);
+ assertNotEquals(aaaStatisticsManager.getAaaStats().getRadiusRejectResponsesRx(), ZERO);
// Counts the aaa Statistics count
countAaaStatistics();
@@ -578,11 +578,11 @@
// Check for increase of Stats
assertNotEquals(aaaStatisticsManager.getAaaStats().getEapolResIdentityMsgTrans(), ZERO);
- assertNotEquals(aaaStatisticsManager.getAaaStats().getEapolStartReqTrans(), ZERO);
+ assertNotEquals(aaaStatisticsManager.getAaaStats().getEapolStartReqRx(), ZERO);
- assertNotEquals(aaaStatisticsManager.getAaaStats().getAccessRequestsTx(), ZERO);
+ assertNotEquals(aaaStatisticsManager.getAaaStats().getRadiusAccessRequestsTx(), ZERO);
assertNotEquals(aaaStatisticsManager.getAaaStats().getDroppedResponsesRx(), ZERO);
- assertNotEquals(aaaStatisticsManager.getAaaStats().getPendingRequests(), ZERO);
+ assertNotEquals(aaaStatisticsManager.getAaaStats().getRadiusPendingRequests(), ZERO);
assertNotEquals(aaaStatisticsManager.getAaaStats().getMalformedResponsesRx(), ZERO);
assertNotEquals(aaaStatisticsManager.getAaaStats().getRequestReTx(), ZERO);
assertNotEquals(aaaStatisticsManager.getAaaStats().getUnknownTypeRx(), ZERO);
@@ -723,10 +723,10 @@
//Check for increase in stats
assertNotEquals(aaaStatisticsManager.getAaaStats().getEapolLogoffRx(), ZERO);
assertNotEquals(aaaStatisticsManager.getAaaStats().getEapolResIdentityMsgTrans(), ZERO);
- assertNotEquals(aaaStatisticsManager.getAaaStats().getEapolAuthSuccessTrans(), ZERO);
- assertNotEquals(aaaStatisticsManager.getAaaStats().getEapolStartReqTrans(), ZERO);
+ assertNotEquals(aaaStatisticsManager.getAaaStats().getEapolAuthSuccessTx(), ZERO);
+ assertNotEquals(aaaStatisticsManager.getAaaStats().getEapolStartReqRx(), ZERO);
assertNotEquals(aaaStatisticsManager.getAaaStats().getEapolTransRespNotNak(), ZERO);
- assertNotEquals(aaaStatisticsManager.getAaaStats().getEapPktTxauthChooseEap(), ZERO);
+ assertNotEquals(aaaStatisticsManager.getAaaStats().getEapolChallengeReqTx(), ZERO);
assertNotEquals(aaaStatisticsManager.getAaaStats().getAuthStateIdle(), ZERO);
// Counts the aaa Statistics count
countAaaStatistics();
@@ -791,7 +791,7 @@
//Check for increase in stats
assertNotEquals(aaaStatisticsManager.getAaaStats().getEapolResIdentityMsgTrans(), ZERO);
- assertNotEquals(aaaStatisticsManager.getAaaStats().getEapolStartReqTrans(), ZERO);
+ assertNotEquals(aaaStatisticsManager.getAaaStats().getEapolStartReqRx(), ZERO);
countAaaStatistics();
} catch (Exception e) {
log.error(e.getMessage());
@@ -803,14 +803,14 @@
// Calculates the AAA statistics count.
public void countAaaStatistics() {
- assertThat(aaaStatisticsManager.getAaaStats().getAcceptResponsesRx(), notNullValue());
- assertThat(aaaStatisticsManager.getAaaStats().getAccessRequestsTx(), notNullValue());
- assertThat(aaaStatisticsManager.getAaaStats().getChallengeResponsesRx(), notNullValue());
+ assertThat(aaaStatisticsManager.getAaaStats().getRadiusAcceptResponsesRx(), notNullValue());
+ assertThat(aaaStatisticsManager.getAaaStats().getRadiusAccessRequestsTx(), notNullValue());
+ assertThat(aaaStatisticsManager.getAaaStats().getRadiusChallengeResponsesRx(), notNullValue());
assertThat(aaaStatisticsManager.getAaaStats().getDroppedResponsesRx(), notNullValue());
assertThat(aaaStatisticsManager.getAaaStats().getInvalidValidatorsRx(), notNullValue());
assertThat(aaaStatisticsManager.getAaaStats().getMalformedResponsesRx(), notNullValue());
- assertThat(aaaStatisticsManager.getAaaStats().getPendingRequests(), notNullValue());
- assertThat(aaaStatisticsManager.getAaaStats().getRejectResponsesRx(), notNullValue());
+ assertThat(aaaStatisticsManager.getAaaStats().getRadiusPendingRequests(), notNullValue());
+ assertThat(aaaStatisticsManager.getAaaStats().getRadiusRejectResponsesRx(), notNullValue());
assertThat(aaaStatisticsManager.getAaaStats().getRequestReTx(), notNullValue());
assertThat(aaaStatisticsManager.getAaaStats().getRequestRttMilis(), notNullValue());
assertThat(aaaStatisticsManager.getAaaStats().getUnknownServerRx(), notNullValue());