diff options
Diffstat (limited to 'resources')
| -rw-r--r-- | resources/libraries/python/HTTPRequest.py | 9 | ||||
| -rw-r--r-- | resources/libraries/python/honeycomb/HoneycombSetup.py | 36 | ||||
| -rw-r--r-- | resources/libraries/robot/honeycomb/honeycomb.robot | 16 |
3 files changed, 28 insertions, 33 deletions
diff --git a/resources/libraries/python/HTTPRequest.py b/resources/libraries/python/HTTPRequest.py index 9c64dbbf9b..869078bca3 100644 --- a/resources/libraries/python/HTTPRequest.py +++ b/resources/libraries/python/HTTPRequest.py @@ -1,4 +1,4 @@ -# Copyright (c) 2016 Cisco and/or its affiliates. +# Copyright (c) 2017 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: @@ -179,9 +179,12 @@ class HTTPRequest(object): """ timeout = kwargs["timeout"] - if BuiltIn().get_variable_value("${use_odl_client}"): - # TODO: node["honeycomb"]["odl_port"] + use_odl = BuiltIn().get_variable_value("${use_odl_client}") + + if use_odl: port = 8181 + # Using default ODL Restconf port + # TODO: add node["honeycomb"]["odl_port"] to topology, use it here odl_url_part = "/network-topology:network-topology/topology/" \ "topology-netconf/node/vpp/yang-ext:mount" else: diff --git a/resources/libraries/python/honeycomb/HoneycombSetup.py b/resources/libraries/python/honeycomb/HoneycombSetup.py index 50fd1c997d..d23b092655 100644 --- a/resources/libraries/python/honeycomb/HoneycombSetup.py +++ b/resources/libraries/python/honeycomb/HoneycombSetup.py @@ -1,4 +1,4 @@ -# Copyright (c) 2016 Cisco and/or its affiliates. +# Copyright (c) 2017 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: @@ -432,33 +432,29 @@ class HoneycombSetup(object): "node {0}, {1}".format(node, stderr)) @staticmethod - def find_odl_client(node): - """Check if there is a karaf directory in home. + def setup_odl_client(node, odl_name): + """Start ODL client on the specified node. - :param node: Honeycomb node. + Karaf should be located in /nfs/common, and VPP and Honeycomb should + already be running, otherwise the start will fail. + :param node: Node to start ODL client on. + :param odl_name: Name of ODL client version to use. :type node: dict - :returns: True if ODL client is present on node, else False. - :rtype: bool + :type odl_name: str + :raises HoneycombError: If Honeycomb fails to start. """ + logger.debug("Copying ODL Client to home dir.") + ssh = SSH() ssh.connect(node) - (ret_code, stdout, _) = ssh.exec_command_sudo( - "ls ~ | grep karaf") - logger.debug(stdout) - return not bool(ret_code) + cmd = "cp -r /nfs/common/*karaf_{name}* ~/karaf".format(name=odl_name) - @staticmethod - def start_odl_client(node): - """Start ODL client on the specified node. - - karaf should be located in home directory, and VPP and Honeycomb should - already be running, otherwise the start will fail. - :param node: Nodes to start ODL client on. - :type node: dict - :raises HoneycombError: If Honeycomb fails to start. - """ + (ret_code, _, _) = ssh.exec_command_sudo(cmd) + if int(ret_code) != 0: + raise HoneycombError( + "Failed to copy ODL client on node {0}".format(node["host"])) logger.console("\nStarting ODL client ...") diff --git a/resources/libraries/robot/honeycomb/honeycomb.robot b/resources/libraries/robot/honeycomb/honeycomb.robot index 7813ee26bf..336039e1fb 100644 --- a/resources/libraries/robot/honeycomb/honeycomb.robot +++ b/resources/libraries/robot/honeycomb/honeycomb.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2016 Cisco and/or its affiliates. +# Copyright (c) 2017 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: @@ -85,9 +85,9 @@ | | ... | \| Restart Honeycomb and VPP and clear persisted configuration \ | | ... | \| ${nodes['DUT1']} \| | | [Arguments] | ${node} +| | Log | Performing clean restart of Honeycomb and VPP. | console=True | | Stop Honeycomb service on DUTs | ${node} | | Clear persisted Honeycomb configuration | ${node} -| | Log | Persistence files cleared. | console=True | | Setup DUT | ${node} | | Setup Honeycomb service on DUTs | ${node} @@ -101,6 +101,7 @@ | | ... | | ... | \| Restart Honeycomb and VPP \| ${nodes['DUT1']} \| | | [Arguments] | ${node} +| | Log | Performing clean restart of Honeycomb and VPP. | console=True | | Restart Honeycomb and VPP on DUTs | ${node} | | Wait until keyword succeeds | 4min | 16sec | | ... | Check honeycomb startup state | ${node} @@ -117,14 +118,9 @@ | | [Arguments] | ${node} | | Archive Honeycomb log | ${node} -| Find ODL client on node -| | [Arguments] | ${node} -| | ${odl_present}= | Find ODL Client | ${node} -| | Return from keyword | ${odl_present} - -| Start ODL client on node -| | [Arguments] | ${node} -| | Start ODL client | ${node} +| Setup ODL Client Service On DUT +| | [Arguments] | ${node} | ${odl_name} +| | Setup ODL client | ${node} | ${odl_name} | | Wait until keyword succeeds | 4min | 16sec | | ... | Mount Honeycomb on ODL | ${node} | | Wait until keyword succeeds | 2min | 16sec |