Move Honeycomb libraries to honeycomb subdirectory.

- move all Honeycomb related libraries written in python to new
  directory resources/libraries/python/honeycomb
- update all related includes in all source files

Change-Id: Ifa96b8f670b456b14421929d6020ddf8e02d9cbc
Signed-off-by: Tibor Frank <tifrank@cisco.com>

diff --git a/resources/libraries/python/HcAPIKwBridgeDomain.py b/resources/libraries/python/honeycomb/HcAPIKwBridgeDomain.py
similarity index 97%
rename from resources/libraries/python/HcAPIKwBridgeDomain.py
rename to resources/libraries/python/honeycomb/HcAPIKwBridgeDomain.py
index 2f7c149..0906d5c 100644 (file)
--- 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.
 """
 
 operational data.
 """
 

-

 from resources.libraries.python.HTTPRequest import HTTPCodes
 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):
 
 
 class BridgeDomainKeywords(object):

diff --git a/resources/libraries/python/HcAPIKwInterfaces.py b/resources/libraries/python/honeycomb/HcAPIKwInterfaces.py
similarity index 99%
rename from resources/libraries/python/HcAPIKwInterfaces.py
rename to resources/libraries/python/honeycomb/HcAPIKwInterfaces.py
index ccdb5dd..8f6819e 100644 (file)
--- 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.
 """
 
 operational data.
 """
 

-

 from resources.libraries.python.HTTPRequest import HTTPCodes
 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):
 
 
 class InterfaceKeywords(object):

diff --git a/resources/libraries/python/HoneycombSetup.py b/resources/libraries/python/honeycomb/HoneycombSetup.py
similarity index 97%
rename from resources/libraries/python/HoneycombSetup.py
rename to resources/libraries/python/honeycomb/HoneycombSetup.py
index 979b501..e9c1295 100644 (file)
--- a/resources/libraries/python/HoneycombSetup.py
+++ b/resources/libraries/python/honeycomb/HoneycombSetup.py
@@ -15,13 +15,14 @@
 
 from robot.api import logger
 
 
 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.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.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):
 
 
 class HoneycombSetup(object):

diff --git a/resources/libraries/python/HoneycombUtil.py b/resources/libraries/python/honeycomb/HoneycombUtil.py
similarity index 100%
rename from resources/libraries/python/HoneycombUtil.py
rename to 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 (file)
index 0000000..c35326d
--- /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 da3ae0a..a3f695c 100644 (file)
--- 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
 
 *** 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
 
 *** Keywords ***
 | Honeycomb creates first L2 bridge domain

diff --git a/resources/libraries/robot/honeycomb/honeycomb.robot b/resources/libraries/robot/honeycomb/honeycomb.robot
index 54aff2f..c71d6a7 100644 (file)
--- a/resources/libraries/robot/honeycomb/honeycomb.robot
+++ b/resources/libraries/robot/honeycomb/honeycomb.robot
@@ -12,9 +12,8 @@
 # limitations under the License.
 
 *** Settings ***
 # 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
 
 *** Keywords ***
 | Setup Honeycomb service on DUTs

diff --git a/resources/libraries/robot/honeycomb/interfaces.robot b/resources/libraries/robot/honeycomb/interfaces.robot
index f98cca0..d27aff4 100644 (file)
--- a/resources/libraries/robot/honeycomb/interfaces.robot
+++ b/resources/libraries/robot/honeycomb/interfaces.robot
@@ -12,11 +12,11 @@
 # limitations under the License.
 
 *** Settings ***
 # limitations under the License.
 
 *** Settings ***

-| Library | resources/libraries/python/HoneycombUtil.py
+| Library | resources/libraries/python/honeycomb/HoneycombUtil.py

 | Library | resources.libraries.python.InterfaceUtil
 | 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
 
 *** Keywords ***
 | Interface state is