diff options
| -rw-r--r-- | resources/libraries/python/honeycomb/HcAPIKwBridgeDomain.py (renamed from resources/libraries/python/HcAPIKwBridgeDomain.py) | 9 | ||||
| -rw-r--r-- | resources/libraries/python/honeycomb/HcAPIKwInterfaces.py (renamed from resources/libraries/python/HcAPIKwInterfaces.py) | 9 | ||||
| -rw-r--r-- | resources/libraries/python/honeycomb/HoneycombSetup.py (renamed from resources/libraries/python/HoneycombSetup.py) | 9 | ||||
| -rw-r--r-- | resources/libraries/python/honeycomb/HoneycombUtil.py (renamed from resources/libraries/python/HoneycombUtil.py) | 0 | ||||
| -rw-r--r-- | resources/libraries/python/honeycomb/__init__.py | 16 | ||||
| -rw-r--r-- | resources/libraries/robot/honeycomb/bridge_domain.robot | 6 | ||||
| -rw-r--r-- | resources/libraries/robot/honeycomb/honeycomb.robot | 5 | ||||
| -rw-r--r-- | resources/libraries/robot/honeycomb/interfaces.robot | 8 |
8 files changed, 40 insertions, 22 deletions
diff --git a/resources/libraries/python/HcAPIKwBridgeDomain.py b/resources/libraries/python/honeycomb/HcAPIKwBridgeDomain.py index 2f7c149684..0906d5c762 100644 --- a/resources/libraries/python/HcAPIKwBridgeDomain.py +++ b/resources/libraries/python/honeycomb/HcAPIKwBridgeDomain.py @@ -17,11 +17,12 @@ The keywords make possible to put and get configuration data and to get operational data. """ - from resources.libraries.python.HTTPRequest import HTTPCodes -from resources.libraries.python.HoneycombSetup import HoneycombError -from resources.libraries.python.HoneycombUtil import HoneycombUtil as HcUtil -from resources.libraries.python.HoneycombUtil import DataRepresentation +from resources.libraries.python.honeycomb.HoneycombSetup import HoneycombError +from resources.libraries.python.honeycomb.HoneycombUtil \ + import DataRepresentation +from resources.libraries.python.honeycomb.HoneycombUtil \ + import HoneycombUtil as HcUtil class BridgeDomainKeywords(object): diff --git a/resources/libraries/python/HcAPIKwInterfaces.py b/resources/libraries/python/honeycomb/HcAPIKwInterfaces.py index ccdb5ddefd..8f6819ef5e 100644 --- a/resources/libraries/python/HcAPIKwInterfaces.py +++ b/resources/libraries/python/honeycomb/HcAPIKwInterfaces.py @@ -17,11 +17,12 @@ The keywords make possible to put and get configuration data and to get operational data. """ - from resources.libraries.python.HTTPRequest import HTTPCodes -from resources.libraries.python.HoneycombSetup import HoneycombError -from resources.libraries.python.HoneycombUtil import HoneycombUtil as HcUtil -from resources.libraries.python.HoneycombUtil import DataRepresentation +from resources.libraries.python.honeycomb.HoneycombSetup import HoneycombError +from resources.libraries.python.honeycomb.HoneycombUtil \ + import DataRepresentation +from resources.libraries.python.honeycomb.HoneycombUtil \ + import HoneycombUtil as HcUtil class InterfaceKeywords(object): diff --git a/resources/libraries/python/HoneycombSetup.py b/resources/libraries/python/honeycomb/HoneycombSetup.py index 979b501522..e9c1295260 100644 --- a/resources/libraries/python/HoneycombSetup.py +++ b/resources/libraries/python/honeycomb/HoneycombSetup.py @@ -15,13 +15,14 @@ from robot.api import logger -from resources.libraries.python.topology import NodeType -from resources.libraries.python.ssh import SSH from resources.libraries.python.HTTPRequest import HTTPRequest, HTTPCodes, \ HTTPRequestError -from resources.libraries.python.HoneycombUtil import HoneycombUtil as HcUtil -from resources.libraries.python.HoneycombUtil import HoneycombError from resources.libraries.python.constants import Constants as Const +from resources.libraries.python.honeycomb.HoneycombUtil import HoneycombError +from resources.libraries.python.honeycomb.HoneycombUtil \ + import HoneycombUtil as HcUtil +from resources.libraries.python.ssh import SSH +from resources.libraries.python.topology import NodeType class HoneycombSetup(object): diff --git a/resources/libraries/python/HoneycombUtil.py b/resources/libraries/python/honeycomb/HoneycombUtil.py index 644cf62c43..644cf62c43 100644 --- a/resources/libraries/python/HoneycombUtil.py +++ b/resources/libraries/python/honeycomb/HoneycombUtil.py diff --git a/resources/libraries/python/honeycomb/__init__.py b/resources/libraries/python/honeycomb/__init__.py new file mode 100644 index 0000000000..c35326d604 --- /dev/null +++ b/resources/libraries/python/honeycomb/__init__.py @@ -0,0 +1,16 @@ +# 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. + +""" +__init__ file for directory resources/libraries/python/honeycomb +""" diff --git a/resources/libraries/robot/honeycomb/bridge_domain.robot b/resources/libraries/robot/honeycomb/bridge_domain.robot index da3ae0af47..a3f695cf70 100644 --- a/resources/libraries/robot/honeycomb/bridge_domain.robot +++ b/resources/libraries/robot/honeycomb/bridge_domain.robot @@ -13,9 +13,9 @@ *** Settings *** | Library | resources.libraries.python.L2Util -| Library | resources.libraries.python.HcAPIKwBridgeDomain.BridgeDomainKeywords -| Library | resources.libraries.python.HcAPIKwInterfaces.InterfaceKeywords -| ... | WITH NAME | InterfaceAPI +| Library | resources.libraries.python.honeycomb.HcAPIKwBridgeDomain.BridgeDomainKeywords +| Library | resources.libraries.python.honeycomb.HcAPIKwInterfaces.InterfaceKeywords +| ... | WITH NAME | InterfaceAPI *** Keywords *** | Honeycomb creates first L2 bridge domain diff --git a/resources/libraries/robot/honeycomb/honeycomb.robot b/resources/libraries/robot/honeycomb/honeycomb.robot index 54aff2febf..c71d6a7257 100644 --- a/resources/libraries/robot/honeycomb/honeycomb.robot +++ b/resources/libraries/robot/honeycomb/honeycomb.robot @@ -12,9 +12,8 @@ # limitations under the License. *** Settings *** -| Library | resources/libraries/python/HoneycombSetup.py -| Library | resources/libraries/python/HoneycombUtil.py -| Library | resources/libraries/python/HTTPRequest.py +| Library | resources/libraries/python/honeycomb/HoneycombSetup.py +| Library | resources/libraries/python/honeycomb/HoneycombUtil.py *** Keywords *** | Setup Honeycomb service on DUTs diff --git a/resources/libraries/robot/honeycomb/interfaces.robot b/resources/libraries/robot/honeycomb/interfaces.robot index f98cca0901..d27aff4175 100644 --- a/resources/libraries/robot/honeycomb/interfaces.robot +++ b/resources/libraries/robot/honeycomb/interfaces.robot @@ -12,11 +12,11 @@ # limitations under the License. *** Settings *** -| Library | resources/libraries/python/HoneycombUtil.py +| Library | resources/libraries/python/honeycomb/HoneycombUtil.py | Library | resources.libraries.python.InterfaceUtil -| ... | WITH NAME | interfaceCLI -| Library | resources.libraries.python.HcAPIKwInterfaces.InterfaceKeywords -| ... | WITH NAME | InterfaceAPI +| ... | WITH NAME | interfaceCLI +| Library | resources.libraries.python.honeycomb.HcAPIKwInterfaces.InterfaceKeywords +| ... | WITH NAME | InterfaceAPI *** Keywords *** | Interface state is |