updates to voltha automation tests/framework

Change-Id: I937968d9560811c0cdd6245db39164261d27e37e
diff --git a/libraries/onos.robot b/libraries/onos.robot
index 8ec81db..6416dd2 100644
--- a/libraries/onos.robot
+++ b/libraries/onos.robot
@@ -53,7 +53,7 @@
 Verify Eapol Flows Added
     [Arguments]    ${ip}    ${port}    ${expected_flows}
     [Documentation]    Matches for number of eapol flows based on number of onus
-    ${eapol_flows_added}=    Execute ONOS Command    ${ip}    ${port}    flows -s -f ADDED | grep eapol | wc -l
+    ${eapol_flows_added}=    Execute ONOS Command    ${ip}    ${port}    flows -s -f ADDED | grep eapol | grep IN_PORT | wc -l
     Should Contain    ${eapol_flows_added}    ${expected_flows}
 
 Verify Number of AAA-Users
@@ -68,4 +68,4 @@
     [Documentation]    Matches for number of dhcpacks based on number of onus
     ##TODO: filter by onu serial number instead of count
     ${allocations}=    Execute ONOS Command    ${ip}    ${port}    dhcpl2relay-allocations | grep DHCPACK | wc -l
-    Should Contain    ${allocations}    ${expected_onus}
\ No newline at end of file
+    Should Contain    ${allocations}    ${expected_onus}