Fix for bug/893663
Making Cisco CLI usable from installed packages Change-Id: I35c34d2d0f5c050016663cf04673582806f35b39
This commit is contained in:
parent
219e0b1b8d
commit
b090b380e9
|
@ -0,0 +1,20 @@
|
||||||
|
"""
|
||||||
|
# vim: tabstop=4 shiftwidth=4 softtabstop=4
|
||||||
|
#
|
||||||
|
# Copyright 2011 Cisco Systems, Inc. All rights reserved.
|
||||||
|
#
|
||||||
|
# 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.
|
||||||
|
#
|
||||||
|
# @author: Sumit Naiksatam, Cisco Systems, Inc.
|
||||||
|
#
|
||||||
|
"""
|
|
@ -36,6 +36,7 @@ import subprocess
|
||||||
|
|
||||||
from optparse import OptionParser
|
from optparse import OptionParser
|
||||||
|
|
||||||
|
sys.path.append(os.getcwd())
|
||||||
import quantum.client.cli as qcli
|
import quantum.client.cli as qcli
|
||||||
|
|
||||||
POSSIBLE_TOPDIR = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
|
POSSIBLE_TOPDIR = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
|
||||||
|
@ -153,7 +154,7 @@ COMMANDS = {
|
||||||
"args": ["tenant-id", "instance-id"]}, }
|
"args": ["tenant-id", "instance-id"]}, }
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
def main():
|
||||||
import cli
|
import cli
|
||||||
usagestr = "Usage: %prog [OPTIONS] <command> [args]"
|
usagestr = "Usage: %prog [OPTIONS] <command> [args]"
|
||||||
PARSER = OptionParser(usage=usagestr)
|
PARSER = OptionParser(usage=usagestr)
|
||||||
|
@ -207,3 +208,7 @@ if __name__ == "__main__":
|
||||||
|
|
||||||
LOG.info("Command execution completed")
|
LOG.info("Command execution completed")
|
||||||
sys.exit(0)
|
sys.exit(0)
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
main()
|
||||||
|
|
|
@ -66,4 +66,9 @@ setup(
|
||||||
package_data=PackageData,
|
package_data=PackageData,
|
||||||
data_files=DataFiles,
|
data_files=DataFiles,
|
||||||
eager_resources=EagerResources,
|
eager_resources=EagerResources,
|
||||||
|
entry_points={
|
||||||
|
'console_scripts': [
|
||||||
|
'cisco-quantum = quantum.plugins.cisco.client.cli:main'
|
||||||
|
]
|
||||||
|
},
|
||||||
)
|
)
|
||||||
|
|
|
@ -44,7 +44,7 @@ PackageData = {
|
||||||
|
|
||||||
exclude = ['quantum.client', 'quantum.client.*', 'quantum.server',
|
exclude = ['quantum.client', 'quantum.client.*', 'quantum.server',
|
||||||
'quantum.server.*', 'quantum.tests', 'quantum.tests.*',
|
'quantum.server.*', 'quantum.tests', 'quantum.tests.*',
|
||||||
'quantum.plugins.*']
|
'quantum.plugins.*', 'quantum.plugins']
|
||||||
pkgs = find_packages('.', exclude=exclude)
|
pkgs = find_packages('.', exclude=exclude)
|
||||||
pkgs = filter(lambda x: x.startswith("quantum"), pkgs)
|
pkgs = filter(lambda x: x.startswith("quantum"), pkgs)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue