X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=resources%2Flibraries%2Frobot%2Fhoneycomb%2Fvxlan_gpe.robot;h=20ca7f5f1a21ab70328152a36086e7fd7de3cbe3;hb=80d851c99bfb7b6441e9a364ed5d49f867252eff;hp=14a4910bb61a4003cb92bf9803af5a3debae5553;hpb=6bfae6634aa26c2e88dddf49d91245d880b0222b;p=csit.git

diff --git a/resources/libraries/robot/honeycomb/vxlan_gpe.robot b/resources/libraries/robot/honeycomb/vxlan_gpe.robot
index 14a4910bb6..20ca7f5f1a 100644
--- a/resources/libraries/robot/honeycomb/vxlan_gpe.robot
+++ b/resources/libraries/robot/honeycomb/vxlan_gpe.robot
@@ -13,9 +13,7 @@
 
 *** Settings ***
 | Library | resources.libraries.python.InterfaceUtil
-| ...     | WITH NAME | interfaceCLI
 | Library | resources.libraries.python.honeycomb.HcAPIKwInterfaces.InterfaceKeywords
-| ...     | WITH NAME | InterfaceAPI
 
 *** Variables ***
 # Translation table used to convert values received from Honeycomb to values
@@ -46,7 +44,7 @@
 | | [Arguments] | ${node} | ${interface}
 | | ... | ${base_settings} | ${vxlan_gpe_settings}
 | | ...
-| | interfaceAPI.Create VxLAN GPE interface
+| | Create VxLAN GPE interface
 | | ... | ${node} | ${interface} | &{base_settings} | &{vxlan_gpe_settings}
 
 | Honeycomb removes VxLAN GPE interface
@@ -64,9 +62,9 @@
 | | ...
 | | [Arguments] | ${node} | ${interface}
 | | ...
-| | interfaceAPI.Delete interface | ${node} | ${interface}
+| | Delete interface | ${node} | ${interface}
 
-| VxLAN GPE configuration from Honeycomb should be
+| VxLAN GPE Operational Data From Honeycomb Should Be
 | | [Documentation] | Uses Honeycomb API to get operational data about the\
 | | ... | given interface and compares them to the values provided as arguments.
 | | ...
@@ -78,14 +76,14 @@
 | | ... | - vxlan_gpe_settings - VxLAN GPE specific parameters. Type: dictionary
 | | ...
 | | ... | *Example:*
-| | ... | \| VxLAN GPE configuration from Honeycomb should be \
+| | ... | \| VxLAN GPE Operational Data From Honeycomb Should Be \
 | | ... | \| ${nodes['DUT1']} \| vxlan_gpe_tunnel0 \| ${base_params} \
 | | ... | \| ${vxlan_gpe_params} \|
 | | ...
 | | [Arguments] | ${node} | ${interface}
 | | ... | ${base_settings} | ${vxlan_gpe_settings}
 | | ...
-| | ${api_data}= | interfaceAPI.Get interface oper data | ${node} | ${interface}
+| | ${api_data}= | Get interface oper data | ${node} | ${interface}
 | | Should be equal as strings
 | | ... | ${api_data['name']} | ${base_settings['name']}
 | | Should be equal as strings
@@ -101,7 +99,7 @@
 | | ... | AND
 | | ... | Should be equal as strings | ${api_data['oper-status']} | down
 
-| VxLAN GPE configuration from VAT should be
+| VxLAN GPE Operational Data From VAT Should Be
 | | [Documentation] | Uses VAT to get operational data about the given\
 | | ... | interface and compares them to the values provided as arguments.
 | | ...
@@ -111,12 +109,13 @@
 | | ... | - vxlan_gpe_settings - VxLAN GPE specific parameters. Type: dictionary
 | | ...
 | | ... | *Example:*
-| | ... | \| VxLAN GPE configuration from VAT should be \
+| | ... | \| VxLAN GPE Operational Data From VAT Should Be \
 | | ... | \| ${nodes['DUT1']} \| vxlan_gpe_tunnel0 \| ${vxlan_gpe_params} \|
 | | ...
 | | [Arguments] | ${node} | ${interface} | ${vxlan_gpe_params}
 | | ...
-| | ${vat_data}= | VxLAN GPE Dump | ${node} | ${interface}
+| | ${if1}= | Vpp Get Interface Sw Index | ${node} | ${interface}
+| | ${vat_data}= | VxLAN GPE Dump | ${node} | ${if1}
 | | Should be equal as strings
 | | ... | ${vat_data['local']} | ${vxlan_gpe_params['local']}
 | | Should be equal as strings
@@ -127,8 +126,7 @@
 | | ... | ${vat_data['encap_vrf_id']} | ${vxlan_gpe_params['encap-vrf-id']}
 | | Should be equal as strings
 | | ... | ${vat_data['decap_vrf_id']} | ${vxlan_gpe_params['decap-vrf-id']}
-# VAT dump multiplies protocol value by 16777216
-| | Should be equal as strings | ${vat_data['protocol']/16777216}
+| | Should be equal as strings | ${vat_data['protocol']}
 | | ... | ${protocols['${vxlan_gpe_params['next-protocol']}']}
 
 | VxLAN GPE Interface indices from Honeycomb and VAT should correspond
@@ -148,13 +146,14 @@
 | | ...
 | | [Arguments] | ${node} | ${interface}
 | | ...
-| | ${api_data}= | interfaceAPI.Get interface oper data | ${node} | ${interface}
-| | ${vat_data}= | VxLAN GPE Dump | ${node} | ${interface}
+| | ${api_data}= | Get interface oper data | ${node} | ${interface}
+| | ${if1}= | Vpp Get Interface Sw Index | ${node} | ${interface}
+| | ${vat_data}= | VxLAN GPE Dump | ${node} | ${if1}
 | | ${sw_if_index}= | EVALUATE | ${vat_data['sw_if_index']} + 1
 | | Should be equal as strings
 | | ... | ${api_data['if-index']} | ${sw_if_index}
 
-| VxLAN GPE configuration from Honeycomb should be empty
+| VxLAN GPE Operational Data From Honeycomb Should Be empty
 | | [Documentation] | Uses Honeycomb API to get operational data about\
 | | ... | the given interface and expects to fail.
 | | ...
@@ -162,15 +161,15 @@
 | | ... | - node - information about a DUT node. Type: dictionary
 | | ...
 | | ... | *Example:*
-| | ... | \| VxLAN GPE configuration from Honeycomb should be empty\
+| | ... | \| VxLAN GPE Operational Data From Honeycomb Should Be empty\
 | | ... | \| ${nodes['DUT1']} \| vxlan_gpe_tunnel0 \|
 | | ...
 | | [Arguments] | ${node} | ${interface}
 | | ...
-| | ${api_data}= | interfaceAPI.Get interface oper data | ${node} | ${interface}
+| | ${api_data}= | Get interface oper data | ${node} | ${interface}
 | | Should be empty | ${api_data}
 
-| VxLAN GPE configuration from VAT should be empty
+| VxLAN GPE Operational Data From VAT Should Be empty
 | | [Documentation] | Uses VAT to get operational data about the given\
 | | ... | interface and expects an empty dictionary.
 | | ...
@@ -178,13 +177,12 @@
 | | ... | - node - information about a DUT node. Type: dictionary
 | | ...
 | | ... | *Example:*
-| | ... | \| VxLAN GPE configuration from VAT should be empty\
+| | ... | \| VxLAN GPE Operational Data From VAT Should Be empty\
 | | ... | \| ${nodes['DUT1']} \|
 | | ...
 | | [Arguments] | ${node}
-| | ...
-| | Run Keyword And Expect Error | ValueError: No JSON object could be decoded
-| | ... | VxLAN Dump | ${node}
+| | ${data}= | VxLAN Dump | ${node}
+| | Should be empty | ${data}
 
 | Honeycomb fails to create VxLAN GPE interface
 | | [Documentation] | Uses Honeycomb API to configure a VxLAN tunnel with wrong\
@@ -206,5 +204,5 @@
 | | ... | ${base_settings} | ${vxlan_gpe_settings}
 | | ...
 | | Run keyword and expect error | *HoneycombError*not successful. * code: *00.
-| | ... | interfaceAPI.Create VxLAN GPE interface
+| | ... | Create VxLAN GPE interface
 | | ... | ${node} | ${interface} | &{base_settings} | &{vxlan_gpe_settings}