From 06e6c396413630640cafae3488442a0869f1642d Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Tue, 28 Mar 2017 15:42:20 +0200 Subject: [PATCH] New README.rst and requirements.txt files, setup.py and Makefile updated Change-Id: Iefd4fbc2d7076bd62ba84fefaec24c5484f9d8de Signed-off-by: garciadeblas --- Makefile | 28 ++++++++++++++++++---------- README.rst | 8 ++++++++ requirements.txt | 21 +++++++++++++++++++++ setup.py | 26 +++++++++++++++++++++++++- 4 files changed, 72 insertions(+), 11 deletions(-) create mode 100644 README.rst create mode 100644 requirements.txt diff --git a/Makefile b/Makefile index 122fec0a..b5e6960f 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ SHELL := /bin/bash -all: connectors build package +all: pypackage debpackage prepare: mkdir -p build @@ -7,6 +7,8 @@ prepare: #cd build; mv openmanod.py openmanod cp openmano build/ cp openmanod.cfg build/ + cp requirements.txt build/ + cp README.rst build/ cp openmano.service build/ cp -r vnfs build/ cp -r scenarios build/ @@ -15,26 +17,32 @@ prepare: cd build/scripts; mv service-openmano.sh service-openmano; mv openmano-report.sh openmano-report cp -r database_utils build/ -connectors: +connectors: prepare + # python-novaclient is required for that rm -f build/openmanolinkervimconn.py cd build; for i in `ls vimconn_*.py |sed "s/\.py//"` ; do echo "import $$i" >> openmanolinkervimconn.py; done python build/openmanolinkervimconn.py rm -f build/openmanolinkervimconn.py -build: prepare connectors +build: prepare python -m py_compile build/*.py -clean: - rm -rf build - #find build -name '*.pyc' -delete - #find build -name '*.pyo' -delete - -pip: +pypackage: build cd build; ./setup.py sdist - #cp dist/* /root/artifacts/... + #cp build/dist/* /root/artifacts/... + +debpackage: build + echo "Nothing to be done yet" #fpm -s python -t deb build/setup.py +snappackage: + echo "Nothing to be done yet" + test: ./test/basictest.sh --force --insert-bashrc --install-openvim --init-openvim +clean: + rm -rf build + #find build -name '*.pyc' -delete + #find build -name '*.pyo' -delete diff --git a/README.rst b/README.rst new file mode 100644 index 00000000..3a2be888 --- /dev/null +++ b/README.rst @@ -0,0 +1,8 @@ +=========== +osm-ro +=========== + +osm-ro is the Resource Orchestrator for OSM, dealing with resource operations +against different VIMs such as Openstack, VMware's vCloud Director, openvim +and AWS. + diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 00000000..0f6b6f61 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,21 @@ +--index-url https://pypi.python.org/simple/ + +PyYAML==3.10 +bottle==0.12.7 +PyMySQL==0.7.2 +jsonschema==2.5.1 +paramiko==1.16.0 +argcomplete==0.8.1 +requests==2.13.0 +logutils==0.3.3 +python-cinderclient==1.6.0 +python-glanceclient==2.0.0 +python-keystoneclient==2.3.1 +python-neutronclient==4.1.1 +python-novaclient==3.3.1 +pyvcloud==16 +pyvmomi==6.5 +progressbar==2.3 +prettytable==0.7.2 +boto==2.38.0 + diff --git a/setup.py b/setup.py index ee9fd52f..2d2d07a1 100755 --- a/setup.py +++ b/setup.py @@ -1,11 +1,34 @@ #!/usr/bin/env python -from distutils.core import setup +from setuptools import setup #import glob +requirements = [ + "PyYAML", + "bottle", + "mysqldb", + "jsonschema", + "paramiko", + "argcomplete", + "requests", + "logutils", + "pip", + "novaclient", + "keystoneclient", + "glanceclient", + "neutronclient", + "cinderclient", + "boto", + "pyvcloud", + "progressbar", + "prettytable", + "pyvmomi", +] + setup(name='osm-ro', version='1.0', description='OSM Resource Orchestrator', + long_description=open('README.rst').read(), author='ETSI OSM', author_email='alfonso.tiernosepulveda@telefonica.com', maintainer='garciadeblas', @@ -31,6 +54,7 @@ setup(name='osm-ro', 'vmwarecli', 'vmwarerecli', ], + install_requires=requirements, #package_data={'': ['vnfs', 'scenarios', 'instance-scenarios', 'database_utils/mano_db_structure.sql']} data_files=[('/etc/osm/', ['openmanod.cfg']), ('/etc/systemd/system/', ['openmano.service']), -- 2.25.1