diff --git a/ZenPacks/zenoss/CloudStack/locallibs.py b/ZenPacks/zenoss/CloudStack/locallibs.py new file mode 100644 index 0000000..4cf51d5 --- /dev/null +++ b/ZenPacks/zenoss/CloudStack/locallibs.py @@ -0,0 +1,21 @@ +############################################################################## +# +# Copyright (C) Zenoss, Inc. 2013, all rights reserved. +# +# This content is made available according to terms specified in +# License.zenoss under the directory where your Zenoss product is installed. +# +############################################################################## + + +def add_local_lib_path(): + ''' + Helper to add the ZenPack's lib directory to sys.path. + ''' + import os + import site + + site.addsitedir(os.path.join(os.path.dirname(__file__), 'lib')) + + +add_local_lib_path() diff --git a/ZenPacks/zenoss/CloudStack/modeler/plugins/zenoss/CloudStack.py b/ZenPacks/zenoss/CloudStack/modeler/plugins/zenoss/CloudStack.py index 6638d8c..2b635f1 100644 --- a/ZenPacks/zenoss/CloudStack/modeler/plugins/zenoss/CloudStack.py +++ b/ZenPacks/zenoss/CloudStack/modeler/plugins/zenoss/CloudStack.py @@ -19,9 +19,10 @@ from Products.DataCollector.plugins.CollectorPlugin import PythonPlugin from Products.DataCollector.plugins.DataMaps import ObjectMap, RelationshipMap -from ZenPacks.zenoss.CloudStack.utils import add_local_lib_path -add_local_lib_path() +# Imported or side effect of adding ZenPack's lib directory to sys.path. +import ZenPacks.zenoss.CloudStack.locallibs +# Requires that locallibs first be imported. import txcloudstack diff --git a/ZenPacks/zenoss/CloudStack/poll_cloudstack.py b/ZenPacks/zenoss/CloudStack/poll_cloudstack.py index 5fa0cc2..1e2051e 100755 --- a/ZenPacks/zenoss/CloudStack/poll_cloudstack.py +++ b/ZenPacks/zenoss/CloudStack/poll_cloudstack.py @@ -26,9 +26,10 @@ from twisted.internet import reactor from twisted.internet.defer import DeferredList -from utils import add_local_lib_path -add_local_lib_path() +# Imported or side effect of adding ZenPack's lib directory to sys.path. +import locallibs +# Requires that locallibs first be imported. import txcloudstack # Map of listEvents level response parameter to Zenoss severity. diff --git a/ZenPacks/zenoss/CloudStack/tests/testTXCloudStack.py b/ZenPacks/zenoss/CloudStack/tests/testTXCloudStack.py index 356e8ac..db0cd5d 100644 --- a/ZenPacks/zenoss/CloudStack/tests/testTXCloudStack.py +++ b/ZenPacks/zenoss/CloudStack/tests/testTXCloudStack.py @@ -19,10 +19,12 @@ from Products.ZenTestCase.BaseTestCase import BaseTestCase -from ZenPacks.zenoss.CloudStack.utils import add_local_lib_path from ZenPacks.zenoss.CloudStack.tests.utils import mockGetPage -add_local_lib_path() +# Imported or side effect of adding ZenPack's lib directory to sys.path. +import ZenPacks.zenoss.CloudStack.locallibs + +# Requires that locallibs first be imported. import txcloudstack diff --git a/ZenPacks/zenoss/CloudStack/utils.py b/ZenPacks/zenoss/CloudStack/utils.py index 1d6011a..dc69f4a 100644 --- a/ZenPacks/zenoss/CloudStack/utils.py +++ b/ZenPacks/zenoss/CloudStack/utils.py @@ -17,14 +17,6 @@ from Products.ZenUtils.guid.interfaces import IGlobalIdentifier -def add_local_lib_path(): - """Helper to add the ZenPack's lib directory to PYTHONPATH.""" - import os - import site - - site.addsitedir(os.path.join(os.path.dirname(__file__), 'lib')) - - def guid(obj): ''' Return GUID for obj. diff --git a/setup.py b/setup.py index 6a6d39c..0575458 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ # or saved. Do not modify them directly here. # NB: PACKAGES is deprecated NAME = "ZenPacks.zenoss.CloudStack" -VERSION = "1.1.0" +VERSION = "1.1.1" AUTHOR = "Zenoss Labs " LICENSE = "GPLv2" NAMESPACE_PACKAGES = ['ZenPacks', 'ZenPacks.zenoss']