[VOL-3989] Verifying updated version of meters in ONOS
Change-Id: Ie7d4d8d74cf4b2da0a95e518a575ff9257ac63c2
diff --git a/libraries/onos.robot b/libraries/onos.robot
index 130c8c5..a424301 100755
--- a/libraries/onos.robot
+++ b/libraries/onos.robot
@@ -334,10 +334,12 @@
${us_cir} ${us_cbs} ${us_eir} ${us_ebs} ${us_air} Get Bandwidth Profile Details
... ${ip} ${port} ${us_bw_profile}
Sleep 1s
+ ${us_pbs}= Evaluate ${us_cbs}+${us_ebs}
+ ${us_pir}= Evaluate ${us_eir}+${us_cir}+${us_air}
# Verify meter for upstream bandwidth profile
${us_meter_cmd}= Catenate SEPARATOR=
... meters ${olt_of_id} | grep state=ADDED | grep "rate=${us_cir}, burst-size=${us_cbs}"
- ... | grep "rate=${us_eir}, burst-size=${us_ebs}" | grep "rate=${us_air}, burst-size=0" | wc -l
+ ... | grep "rate=${us_pir}, burst-size=${us_pbs}" | grep "rate=${us_air}, burst-size=0" | wc -l
${upstream_meter_added}= Execute ONOS CLI Command ${ip} ${port}
... ${us_meter_cmd}
Should Be Equal As Integers ${upstream_meter_added} 1
@@ -347,9 +349,11 @@
... ${ip} ${port} ${ds_bw_profile}
Sleep 1s
# Verify meter for downstream bandwidth profile
+ ${ds_pbs}= Evaluate ${ds_cbs}+${ds_ebs}
+ ${ds_pir}= Evaluate ${ds_eir}+${ds_cir}+${ds_air}
${ds_meter_cmd}= Catenate SEPARATOR=
... meters ${olt_of_id} | grep state=ADDED | grep "rate=${ds_cir}, burst-size=${ds_cbs}"
- ... | grep "rate=${ds_eir}, burst-size=${ds_ebs}" | grep "rate=${ds_air}, burst-size=0" | wc -l
+ ... | grep "rate=${ds_pir}, burst-size=${ds_pbs}" | grep "rate=${ds_air}, burst-size=0" | wc -l
${downstream_meter_added}= Execute ONOS CLI Command ${ip} ${port}
... ${ds_meter_cmd}
Should Be Equal As Integers ${downstream_meter_added} 1
@@ -361,10 +365,12 @@
${cir} ${cbs} ${eir} ${ebs} ${air} Get Bandwidth Profile Details
... ${ip} ${port} 'Default'
Sleep 1s
+ ${pbs}= Evaluate ${cbs}+${ebs}
+ ${pir}= Evaluate ${eir}+${cir}+${air}
# Verify meter for default bandwidth profile
${meter_cmd}= Catenate SEPARATOR=
... meters ${olt_of_id} | grep state=ADDED | grep "rate=${cir}, burst-size=${cbs}"
- ... | grep "rate=${eir}, burst-size=${ebs}" | grep "rate=${air}, burst-size=0" | wc -l
+ ... | grep "rate=${pir}, burst-size=${pbs}" | grep "rate=${air}, burst-size=0" | wc -l
${default_meter_added}= Execute ONOS CLI Command ${ip} ${port}
... ${meter_cmd}
Should Be Equal As Integers ${default_meter_added} 1