[VOL-2589]:Check for the ETHERNET_NNI port status for OLT disable and enable
Change-Id: Ia394338438d0126879a3fa34fea43ac6e1998bd8
diff --git a/libraries/voltctl.robot b/libraries/voltctl.robot
index 3b6b0b4..5d370b4 100644
--- a/libraries/voltctl.robot
+++ b/libraries/voltctl.robot
@@ -199,8 +199,8 @@
${astate}= Get From Dictionary ${value} adminstate
${opstatus}= Get From Dictionary ${value} operstatus
${type}= Get From Dictionary ${value} type
- #Should Be Equal '${astate}' 'ENABLED' Device ${device_id} port admin_state != ENABLED values=False
- #Should Be Equal '${opstatus}' 'ACTIVE' Device ${device_id} port oper_status != ACTIVE values=False
+ Should Be Equal '${astate}' 'ENABLED' Device ${device_id} port admin_state != ENABLED values=False
+ Should Be Equal '${opstatus}' 'ACTIVE' Device ${device_id} port oper_status != ACTIVE values=False
Should Be True '${type}' == '${pon_type}' or '${type}' == '${ethernet_type}'
... Device ${device_id} port type is neither ${pon_type} or ${ethernet_type}
END
diff --git a/tests/functional/Voltha_PODTests.robot b/tests/functional/Voltha_PODTests.robot
index eb247fe..3f25744 100644
--- a/tests/functional/Voltha_PODTests.robot
+++ b/tests/functional/Voltha_PODTests.robot
@@ -100,6 +100,8 @@
Enable Device ${olt_device_id}
Wait Until Keyword Succeeds ${timeout} 5s Validate OLT Device ENABLED ACTIVE REACHABLE
... ${olt_serial_number}
+ Wait Until Keyword Succeeds ${timeout} 5s Validate OLT Port Types
+ ... PON_OLT ETHERNET_NNI
FOR ${I} IN RANGE 0 ${num_onus}
${src}= Set Variable ${hosts.src[${I}]}
${dst}= Set Variable ${hosts.dst[${I}]}