diff options
Diffstat (limited to 'resources')
4 files changed, 464 insertions, 3 deletions
diff --git a/resources/libraries/python/honeycomb/HcAPIKwInterfaces.py b/resources/libraries/python/honeycomb/HcAPIKwInterfaces.py index 4eaef11bdb..fdb9b90eb3 100644 --- a/resources/libraries/python/honeycomb/HcAPIKwInterfaces.py +++ b/resources/libraries/python/honeycomb/HcAPIKwInterfaces.py @@ -237,9 +237,26 @@ class InterfaceKeywords(object): intf_state = {"up": "true", "down": "false"} - path = ("interfaces", ("interface", "name", str(interface)), "enabled") - return InterfaceKeywords._set_interface_properties( - node, interface, path, intf_state[state.lower()]) + intf = interface.replace("/", "%2F") + path = "/interface/{0}".format(intf) + + status_code, resp = HcUtil.\ + get_honeycomb_data(node, "config_vpp_interfaces", path) + if status_code != HTTPCodes.OK: + raise HoneycombError( + "Not possible to get configuration information about the " + "interfaces. Status code: {0}.".format(status_code)) + + resp["interface"][0]["enabled"] = intf_state[state.lower()] + + status_code, resp = HcUtil. \ + put_honeycomb_data(node, "config_vpp_interfaces", resp, path, + data_representation=DataRepresentation.JSON) + if status_code != HTTPCodes.OK: + raise HoneycombError( + "The configuration of interface '{0}' was not successful. " + "Status code: {1}.".format(interface, status_code)) + return resp @staticmethod def set_interface_up(node, interface): @@ -1380,3 +1397,82 @@ class InterfaceKeywords(object): "The configuration of interface '{0}' was not successful. " "Status code: {1}.".format(interface, status_code)) return resp + + @staticmethod + def create_pbb_sub_interface(node, intf, sub_if_id, params): + """Creates a PBB sub-interface on the given interface and sets its + parameters. + + :param node: Honeycomb node. + :param intf: The interface where PBB sub-interface will be configured. + :param sub_if_id: Sub-interface ID. + :param params: Configuration parameters of the sub-interface to be + created. + :type node: dict + :type intf: str + :type sub_if_id: str or int + :type params: dict + :return: Content of response. + :rtype: bytearray + :raises HoneycombError: If the configuration of sub-interface is not + successful. + """ + + interface = intf.replace("/", "%2F") + path = "/interface/{0}/sub-interfaces:sub-interfaces/sub-interface/" \ + "{1}".format(interface, sub_if_id) + status_code, resp = HcUtil. \ + put_honeycomb_data(node, "config_vpp_interfaces", params, path, + data_representation=DataRepresentation.JSON) + if status_code != HTTPCodes.OK: + raise HoneycombError( + "The configuration of PBB sub-interface '{0}' was not " + "successful. Status code: {1}.".format(intf, status_code)) + return resp + + @staticmethod + def delete_pbb_sub_interface(node, intf, sub_if_id): + """Deletes the given PBB sub-interface. + + :param node: Honeycomb node. + :param intf: The interface where PBB sub-interface will be deleted. + :param sub_if_id: ID of the PBB sub-interface to be deleted. + :type node: dict + :type intf: str + :type sub_if_id: str or int + :return: Content of response. + :rtype: bytearray + :raises HoneycombError: If the removal of sub-interface is not + successful. + """ + + interface = intf.replace("/", "%2F") + path = "/interface/{0}/sub-interfaces:sub-interfaces/sub-interface/" \ + "{1}".format(interface, sub_if_id) + + status_code, resp = HcUtil. \ + delete_honeycomb_data(node, "config_vpp_interfaces", path) + if status_code != HTTPCodes.OK: + raise HoneycombError( + "The removal of pbb sub-interface '{0}' was not successful. " + "Status code: {1}.".format(intf, status_code)) + return resp + + @staticmethod + def get_pbb_sub_interface_oper_data(node, intf, sub_if_id): + """Retrieves PBB sub-interface operational data from Honeycomb. + + :param node: Honeycomb node. + :param intf: The interface where PBB sub-interface is located. + :param sub_if_id: ID of the PBB sub-interface. + :type node: dict + :type intf: str + :type sub_if_id: str or int + :return: PBB sub-interface operational data. + :rtype: dict + :raises HoneycombError: If the removal of sub-interface is not + successful. + """ + + interface = "{0}.{1}".format(intf, sub_if_id) + return InterfaceKeywords.get_interface_oper_data(node, interface) diff --git a/resources/libraries/python/honeycomb/HoneycombUtil.py b/resources/libraries/python/honeycomb/HoneycombUtil.py index 2b8e28a5a6..f2f012ea9b 100644 --- a/resources/libraries/python/honeycomb/HoneycombUtil.py +++ b/resources/libraries/python/honeycomb/HoneycombUtil.py @@ -338,6 +338,7 @@ class HoneycombUtil(object): base_path = HoneycombUtil.read_path_from_url_file(url_file) path = base_path + path + logger.trace(path) return HTTPRequest.put(node=node, path=path, headers=header, payload=data) diff --git a/resources/libraries/robot/honeycomb/provider_backbone_bridge.robot b/resources/libraries/robot/honeycomb/provider_backbone_bridge.robot new file mode 100644 index 0000000000..e088e69a83 --- /dev/null +++ b/resources/libraries/robot/honeycomb/provider_backbone_bridge.robot @@ -0,0 +1,118 @@ +# Copyright (c) 2016 Cisco and/or its affiliates. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at: +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +*** Settings *** +| Library | resources.libraries.python.honeycomb.HcAPIKwInterfaces.InterfaceKeywords +| ... | WITH NAME | IfAPI + +*** Keywords *** +| Honeycomb Creates PBB Sub Interface +| | [Documentation] | Uses Honeycomb API to set PBB sub-interface on an\ +| | ... | interface. +| | ... +| | ... | *Arguments:* +| | ... | - node - Information about a DUT node. Type: dictionary +| | ... | - super_if - Super-interface. Type: string +| | ... | - sub_if_id - Sub-interface ID. Type: string +| | ... | - params - Parameters of the sub-interface to be created. +| | ... | Type - dictionary +| | ... +| | ... | *Example:* +| | ... | \| Honeycomb creates PBB sub interface \| ${node} \| ${super_if}\ +| | ... | \| ${cfg_pbb_sub_if_1_ID} \| ${cfg_pbb_sub_if_1} \| +| | ... +| | [Arguments] | ${node} | ${super_if} | ${sub_if_id} | ${params} +| | ... +| | IfAPI.Set Interface Up | ${node} | ${super_if} +| | IfAPI.Create PBB Sub Interface +| | ... | ${node} | ${super_if} | ${sub_if_id} | ${params} + +| Honeycomb Removes PBB Sub Interface +| | [Documentation] | Uses Honeycomb API to remove PBB sub-interface from its\ +| | ... | super interface. +| | ... +| | ... | *Arguments:* +| | ... | - node - Information about a DUT node. Type: dictionary +| | ... | - super_if - Super-interface. Type: string +| | ... | - sub_if_id - Sub-interface ID. Type: string +| | ... +| | ... | *Example:* +| | ... | \| Honeycomb Removes PBB sub interface\ +| | ... | \| ${node} \| ${super_if} \| ${cfg_pbb_sub_if_1_ID} \| +| | ... +| | [Arguments] | ${node} | ${super_if} | ${sub_if_id} +| | ... +| | Delete PBB Sub Interface | ${node} | ${super_if} | ${sub_if_id} + +| PBB Sub Interface Operational Data From Honeycomb Should Be +| | [Documentation] | Retrieves PBB sub-interface operational data from +| | ... | Honeycomb and compares with expected configuration. +| | ... +| | ... | *Arguments:* +| | ... | - node - Information about a DUT node. Type: dictionary +| | ... | - super_if - Super-interface. Type: string +| | ... | - sub_if_id - Sub-interface ID. Type: string +| | ... | - expected_params - Expected operational data. Type: dictionary +| | ... +| | ... | *Example:* +| | ... | \| PBB sub interface operational data from Honeycomb should be\ +| | ... | \| ${node} \| ${super_if} \| ${cfg_pbb_sub_if_1_ID}\ +| | ... | \| ${oper_pbb_sub_if_1} \| +| | ... +| | [Arguments] | ${node} | ${super_if} | ${sub_if_id} | ${expected_params} +| | ... +| | ${data}= | IfAPI.Get PBB Sub Interface Oper Data +| | ... | ${node} | ${super_if} | ${sub_if_id} +| | Compare data structures | ${data} | ${expected_params} + +| PBB Sub Interface Operational Data From Honeycomb Should Be Empty +| | [Documentation] | Retrieves interface BPP configuration from Honeycomb,\ +| | ... | and expects an empty dictionary. +| | ... +| | ... | *Arguments:* +| | ... | - node - Information about a DUT node. Type: dictionary +| | ... | - super_if - Super-interface. Type: string +| | ... | - sub_if_id - Sub-interface ID. Type: string +| | ... +| | ... | *Example:* +| | ... | \| PBB sub interface operational data from Honeycomb should be empty\ +| | ... | \| ${node} \| ${super_if} \| ${cfg_pbb_sub_if_1_ID} \| +| | ... +| | [Arguments] | ${node} | ${super_if} | ${sub_if_id} +| | ... +| | ${data}= | IfAPI.Get PBB Sub Interface Oper Data +| | ... | ${node} | ${super_if} | ${sub_if_id} +| | Should be empty | ${data} + +| Honeycomb Fails to Create PBB Sub Interface +| | [Documentation] | Uses Honeycomb API to set PBB sub-interface with wrong\ +| | ... | parameter(s) and expects to fail. +| | ... +| | ... | *Arguments:* +| | ... | - node - Information about a DUT node. Type: dictionary +| | ... | - super_if - Super-interface. Type: string +| | ... | - sub_if_id - Sub-interface ID. Type: string +| | ... | - params - Parameters of the sub-interface to be created. +| | ... | Type - dictionary +| | ... +| | ... | *Example:* +| | ... | \| Honeycomb fails to create PBB sub interface\ +| | ... | \| ${node} \| ${super_if} \| ${cfg_pbb_sub_if_ID}\ +| | ... | \| ${cfg_pbb_sub_if_no_vlan_tag} \| +| | ... +| | [Arguments] | ${node} | ${super_if} | ${sub_if_id} | ${params} +| | ... +| | IfAPI.Set Interface Up | ${node} | ${super_if} +| | Run keyword and expect error | *HoneycombError*not successful*code: *00. +| | ... | IfAPI.Create PBB Sub Interface +| | ... | ${node} | ${super_if} | ${sub_if_id} | ${params} diff --git a/resources/test_data/honeycomb/pbb/pbb.py b/resources/test_data/honeycomb/pbb/pbb.py new file mode 100644 index 0000000000..93ef2e28cf --- /dev/null +++ b/resources/test_data/honeycomb/pbb/pbb.py @@ -0,0 +1,246 @@ +# Copyright (c) 2016 Cisco and/or its affiliates. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at: +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +"""Test variables for provider backbone bridge test suite.""" + +# pylint: disable=invalid-name + +# Add pbb sub interface +# Configuration data +cfg_pbb_sub_if_1_ID = '1' +cfg_pbb_sub_if_1 = { + "sub-interface": [ + { + "identifier": cfg_pbb_sub_if_1_ID, + "vlan-type": "dot1ah-types:802dot1ah", + "enabled": "true", + "admin-status": "up", + "oper-status": "up", + "pbb": { + "source-address": "aa:aa:aa:aa:aa:ab", + "destination-address": "bb:bb:bb:bb:bb:bc", + "b-vlan-tag-vlan-id": "2223", + "i-tag-isid": "12" + }, + } + ] +} + +# Expected operational data: +oper_pbb_sub_if_1 = { + 'admin-status': 'up', + 'ietf-ip:ipv4': {}, + 'oper-status': 'up', + 'sub-interfaces:sub-interfaces': {}, + 'type': 'iana-if-type:ethernetCsmacd', + 'v3po:ethernet': { + 'duplex': 'full', + 'mtu': 9216 + } +} + +# Modify pbb sub interface +# Configuration data +cfg_pbb_sub_if_1_ID = '2' +cfg_pbb_sub_if_1_mod = { + "sub-interface": [ + { + "identifier": cfg_pbb_sub_if_1_ID, + "vlan-type": "dot1ah-types:802dot1ah", + "enabled": "true", + "admin-status": "up", + "oper-status": "up", + "pbb": { + "source-address": "aa:aa:aa:aa:aa:de", + "destination-address": "bb:bb:bb:bb:bb:ed", + "b-vlan-tag-vlan-id": "2223", + "i-tag-isid": "12" + }, + } + ] +} + +# Expected operational data: +oper_pbb_sub_if_1_mod = { + 'admin-status': 'up', + 'ietf-ip:ipv4': {}, + 'oper-status': 'up', + 'sub-interfaces:sub-interfaces': {}, + 'type': 'iana-if-type:ethernetCsmacd', + 'v3po:ethernet': { + 'duplex': 'full', + 'mtu': 9216 + } +} + +# Configuration data +cfg_pbb_sub_if_2_ID = '3' +cfg_pbb_sub_if_2 = { + "sub-interface": [ + { + "identifier": cfg_pbb_sub_if_2_ID, + "vlan-type": "dot1ah-types:802dot1ah", + "enabled": "true", + "admin-status": "up", + "oper-status": "up", + "pbb": { + "source-address": "aa:aa:aa:aa:aa:cc", + "destination-address": "bb:bb:bb:bb:bb:dd", + "b-vlan-tag-vlan-id": "10", + "i-tag-isid": "20" + }, + } + ] +} + +# Expected operational data: +oper_pbb_sub_if_2 = { + 'admin-status': 'up', + 'ietf-ip:ipv4': {}, + 'oper-status': 'up', + 'sub-interfaces:sub-interfaces': {}, + 'type': 'iana-if-type:ethernetCsmacd', + 'v3po:ethernet': { + 'duplex': 'full', + 'mtu': 9216 + } +} + +# Configuration data +cfg_pbb_sub_if_3_ID = '4' +cfg_pbb_sub_if_3 = { + "sub-interface": [ + { + "identifier": cfg_pbb_sub_if_3_ID, + "vlan-type": "dot1ah-types:802dot1ah", + "enabled": "true", + "admin-status": "up", + "oper-status": "up", + "pbb": { + "source-address": "aa:aa:aa:aa:cc:aa", + "destination-address": "bb:bb:bb:bb:dd:bb", + "b-vlan-tag-vlan-id": "30", + "i-tag-isid": "40" + }, + } + ] +} + +# Expected operational data: +oper_pbb_sub_if_3 = { + 'admin-status': 'up', + 'ietf-ip:ipv4': {}, + 'oper-status': 'up', + 'sub-interfaces:sub-interfaces': {}, + 'type': 'iana-if-type:ethernetCsmacd', + 'v3po:ethernet': { + 'duplex': 'full', + 'mtu': 9216 + } +} + +# Wrong configuration data +# Wrong source-address +cfg_pbb_sub_if_ID = '5' +cfg_pbb_sub_if_wrong_src_addr = { + "sub-interface": [ + { + "identifier": cfg_pbb_sub_if_ID, + "vlan-type": "dot1ah-types:802dot1ah", + "enabled": "true", + "admin-status": "up", + "oper-status": "up", + "pbb": { + "source-address": "ab:cd:ef:gh:ij", + "destination-address": "bb:bb:bb:bb:bb:bc", + "b-vlan-tag-vlan-id": "2223", + "i-tag-isid": "12" + }, + } + ] +} + +# Wrong destination-address +cfg_pbb_sub_if_wrong_dst_addr = { + "sub-interface": [ + { + "identifier": cfg_pbb_sub_if_ID, + "vlan-type": "dot1ah-types:802dot1ah", + "enabled": "true", + "admin-status": "up", + "oper-status": "up", + "pbb": { + "source-address": "aa:aa:aa:aa:aa:ab", + "destination-address": "ab:cd:ef:gh:ij", + "b-vlan-tag-vlan-id": "2223", + "i-tag-isid": "12" + }, + } + ] +} + +# Wrong b-vlan-tag-vlan-id +cfg_pbb_sub_if_wrong_vlan_tag = { + "sub-interface": [ + { + "identifier": cfg_pbb_sub_if_ID, + "vlan-type": "dot1ah-types:802dot1ah", + "enabled": "true", + "admin-status": "up", + "oper-status": "up", + "pbb": { + "source-address": "aa:aa:aa:aa:aa:ab", + "destination-address": "bb:bb:bb:bb:bb:bc", + "b-vlan-tag-vlan-id": "123456789", + "i-tag-isid": "12" + }, + } + ] +} + +# Wrong i-tag-isid +cfg_pbb_sub_if_wrong_i_tag = { + "sub-interface": [ + { + "identifier": cfg_pbb_sub_if_ID, + "vlan-type": "dot1ah-types:802dot1ah", + "enabled": "true", + "admin-status": "up", + "oper-status": "up", + "pbb": { + "source-address": "aa:aa:aa:aa:aa:ab", + "destination-address": "bb:bb:bb:bb:bb:bc", + "b-vlan-tag-vlan-id": "2223", + "i-tag-isid": "167772152345" + }, + } + ] +} + +# b-vlan-tag-vlan-id is missing +cfg_pbb_sub_if_no_vlan_tag = { + "sub-interface": [ + { + "identifier": cfg_pbb_sub_if_ID, + "vlan-type": "dot1ah-types:802dot1ah", + "enabled": "true", + "admin-status": "up", + "oper-status": "up", + "pbb": { + "source-address": "aa:aa:aa:aa:aa:ab", + "destination-address": "bb:bb:bb:bb:bb:bc", + "i-tag-isid": "12" + }, + } + ] +} |