From: sousaedu Date: Thu, 18 Feb 2021 13:57:01 +0000 (+0100) Subject: Pip standardization and tox replacement X-Git-Tag: v9.1.2~3 X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F55%2F10855%2F5;p=osm%2FRO.git Pip standardization and tox replacement Change-Id: I4b03caf38b2fff796f861628d271214ea4ad0010 Signed-off-by: sousaedu --- diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..e80c20f4 --- /dev/null +++ b/.gitignore @@ -0,0 +1,62 @@ +############################################################################ +# Copyright 2021 ETSI +# +# 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. +############################################################################ + +# TOX +.tox/ + +# Virtualenv +venv/ + +# Coverage +.coverage +cover +coverage.xml +nosetests.xml + +# Python +*.pyc +*.pyo +*.eggs/ +*.egg-info/ + +# logs of openmano +logs + +# pycharm +.idea + +# eclipse +.project +.pydevproject +.settings + +# vscode +.vscode + +#local stuff files that end in ".local" or folders called "local" +vnfs/*.local +test/*.local +scenarios/*.local +instance-scenarios/*.local +database_utils/*.local +scripts/*.local +local +vnfs/local +test/local +scenarios/local +instance-scenarios/local +database_utils/local +scripts/local diff --git a/.gitignore-common b/.gitignore-common deleted file mode 100644 index 85235b2f..00000000 --- a/.gitignore-common +++ /dev/null @@ -1,60 +0,0 @@ -## -# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. -# This file is part of openmano -# 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. -# -# For those usages not covered by the Apache License, Version 2.0 please -# contact with: nfvlabs@tid.es -## - -# This is a template with common files to be igonored, after clone make a copy to .gitignore -# cp .gitignore-common .gitignore - -.tox/ -.coverage - -*.pyc -*.pyo - -#auto-ignore -.gitignore - -#logs of openmano -logs - -#pycharm -.idea - -#eclipse -.project -.pydevproject -.settings - -#local stuff files that end in ".local" or folders called "local" -*.local -vnfs/*.local -test/*.local -scenarios/*.local -instance-scenarios/*.local -database_utils/*.local -scripts/*.local -local -vnfs/local -test/local -scenarios/local -instance-scenarios/local -database_utils/local -scripts/local - diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 00000000..8a68d43f --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,24 @@ +# Copyright 2021 Canonical Ltd. +# +# 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. +# +# For those usages not covered by the Apache License, Version 2.0 please +# contact: legal@canonical.com +# +# To get in touch with the maintainers, please contact: +# osm-charmers@lists.launchpad.net +## + +include: + - project: 'devops/cicd' + file: '/templates/osm-base.yml' diff --git a/Dockerfile b/Dockerfile index 9ed97d6d..3fad2120 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,3 @@ -# Copyright 2018 Telefonica S.A. -# # 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 @@ -12,23 +10,27 @@ # implied. # See the License for the specific language governing permissions and # limitations under the License. - -# This Dockerfile is intented for devops and deb package generation +######################################################################################## +# This Dockerfile is intented for devops testing and deb package generation +# +# To run stage 2 locally: +# +# docker build -t stage2 . +# docker run -ti -v `pwd`:/work -w /work --entrypoint /bin/bash stage2 +# devops-stages/stage-test.sh +# devops-stages/stage-build.sh # -# Use Dockerfile-local for running osm/RO in a docker container from source FROM ubuntu:18.04 -RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get --yes install git tox make python3 python3-pip debhelper wget \ - python3-all apt-utils libmysqlclient-dev mysql-client && \ - DEBIAN_FRONTEND=noninteractive python3 -m pip install -U setuptools setuptools-version-command stdeb - # needed for tests: libmysqlclient-dev mysql-client tox - # TODO remove apt # libssl-dev -# TODO py3 comment -# Uncomment this block to generate automatically a debian package and show info -# # Set the working directory to /app -# WORKDIR /app -# # Copy the current directory contents into the container at /app -# ADD . /app -# CMD /app/devops-stages/stage-build.sh && find deb_dist -name "*.deb" -exec dpkg -I {} ";" +RUN DEBIAN_FRONTEND=noninteractive apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get -y install \ + debhelper \ + git \ + python3 \ + python3-all \ + python3-dev \ + python3-setuptools + +RUN python3 -m easy_install pip==21.0.1 +RUN pip3 install tox==3.22.0 diff --git a/Dockerfile-local b/Dockerfile-local deleted file mode 100644 index 72b28cec..00000000 --- a/Dockerfile-local +++ /dev/null @@ -1,91 +0,0 @@ -## -# 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. -## - -FROM ubuntu:18.04 - -LABEL authors="Alfonso Tierno" - -RUN apt-get update && apt-get install -y git python3 python3-pip \ - && python3 -m pip install --upgrade pip \ - && DEBIAN_FRONTEND=noninteractive apt-get -y install libssl-dev libmysqlclient-dev mysql-client \ - build-essential libffi-dev cargo \ - && DEBIAN_FRONTEND=noninteractive python3 -m pip install -U networking-l2gw \ - && DEBIAN_FRONTEND=noninteractive python3 -m pip install -U progressbar pyvmomi pyvcloud==19.1.1 \ - && DEBIAN_FRONTEND=noninteractive apt-get -y install genisoimage - -# This is not needed, because package dependency will install anyway. -# But done here in order to harry up image generation using cache -RUN DEBIAN_FRONTEND=noninteractive apt-get -y install python3-neutronclient python3-openstackclient \ - python3-requests python3-netaddr python3-argcomplete curl \ - && DEBIAN_FRONTEND=noninteractive curl -Lo /tmp/libzenohc.so https://github.com/eclipse-fog05/fog05/releases/download/v0.1.0/libzenohc.so \ - && mv /tmp/libzenohc.so /usr/local/lib/libzenohc.so \ - && DEBIAN_FRONTEND=noninteractive python3 -m pip install -U jsonrpclib-pelix cvprac "azure==4.0.0" boto \ - pyone "oca @ git+https://github.com/python-oca/python-oca#egg=oca" \ - pyangbind sphinx zenoh==0.3.0 yaks==0.3.0.post1 fog05-sdk==0.2.0 fog05==0.2.0 "cryptography>=2.5" - - -# DEBIAN_FRONTEND=noninteractive apt-get -y install python-openstacksdk python-openstackclient && \ -# TODO py3 DEBIAN_FRONTEND=noninteractive add-apt-repository -y cloud-archive:rocky && apt-get update && apt-get install -y python3-networking-l2gw \ - -# DEBIAN_FRONTEND=noninteractive apt-get -y install python-cffi libssl-dev libffi-dev python-mysqldb && \ -# && DEBIAN_FRONTEND=noninteractive apt-get -y install software-properties-common && \ -# DEBIAN_FRONTEND=noninteractive apt-get -y install wget tox && \ - -COPY . /root/RO - -RUN python3 -m pip install -e /root/RO/RO-plugin && \ - python3 -m pip install -e /root/RO/NG-RO && \ - python3 -m pip install -e /root/RO/RO-VIM-vmware && \ - python3 -m pip install -e /root/RO/RO-VIM-openstack && \ - python3 -m pip install -e /root/RO/RO-VIM-openvim && \ - python3 -m pip install -e /root/RO/RO-VIM-aws && \ - python3 -m pip install -e /root/RO/RO-VIM-azure && \ - python3 -m pip install -e /root/RO/RO-VIM-fos && \ - python3 -m pip install -e /root/RO/RO-SDN-dynpac && \ - python3 -m pip install -e /root/RO/RO-SDN-ietfl2vpn && \ - python3 -m pip install -e /root/RO/RO-SDN-onos_vpls && \ - python3 -m pip install -e /root/RO/RO-SDN-onos_openflow && \ - python3 -m pip install -e /root/RO/RO-SDN-odl_openflow && \ - python3 -m pip install -e /root/RO/RO-SDN-floodlight_openflow && \ - python3 -m pip install -e /root/RO/RO-SDN-arista_cloudvision && \ - python3 -m pip install -e /root/RO/RO-SDN-juniper_contrail && \ - rm -rf /root/.cache && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* - -EXPOSE 9090 - -ENV OSMRO_NG True - -# database -ENV OSMRO_DATABASE_DRIVER mongo -ENV OSMRO_DATABASE_URI mongodb://mongo:27017 -# ENV OSMRO_DATABASE_COMMONKEY xxx -# ENV OSMRO_DATABASE_USER xxx -# ENV OSMRO_DATABASE_PASSWORD xxx - -# message -ENV OSMRO_MESSAGE_DRIVER kafka -ENV OSMRO_MESSAGE_HOST kafka -ENV OSMRO_MESSAGE_PORT 9092 - -# logs -ENV OSMRO_LOG_LEVEL DEBUG - -CMD ["python3", "-u", "-m", "osm_ng_ro.ro_main"] - -# HEALTHCHECK --start-period=30s --interval=10s --timeout=5s --retries=12 \ -# CMD curl --silent --fail http://localhost:9090/ro || exit 1 - diff --git a/Dockerfile.local b/Dockerfile.local new file mode 100644 index 00000000..baff19a8 --- /dev/null +++ b/Dockerfile.local @@ -0,0 +1,136 @@ +############################################################################ +# Copyright 2021 ETSI +# +# 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. +############################################################################ + +FROM ubuntu:18.04 as INSTALL + +WORKDIR /build + +RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \ + DEBIAN_FRONTEND=noninteractive apt-get --yes install \ + gcc python3 python3-dev python3-venv python3-pip \ + python3-setuptools curl git genisoimage netbase && \ + python3 -m pip install -U pip build + +COPY . /build + +RUN git clone -b v9.0 https://osm.etsi.org/gerrit/osm/common.git + +RUN python3 -m pip install -r requirements.txt \ + -r common/requirements.txt + +RUN python3 -m build /build/common && \ + python3 -m pip install /build/common/dist/*.whl + +RUN python3 -m build /build/RO-plugin && \ + python3 -m pip install /build/RO-plugin/dist/*.whl + +RUN python3 -m build /build/NG-RO && \ + python3 -m pip install /build/NG-RO/dist/*.whl + +RUN python3 -m build /build/RO-VIM-vmware && \ + python3 -m pip install /build/RO-VIM-vmware/dist/*.whl + +RUN python3 -m build /build/RO-VIM-openstack && \ + python3 -m pip install /build/RO-VIM-openstack/dist/*.whl + +RUN python3 -m build /build/RO-VIM-openvim && \ + python3 -m pip install /build/RO-VIM-openvim/dist/*.whl + +RUN python3 -m build /build/RO-VIM-aws && \ + python3 -m pip install /build/RO-VIM-aws/dist/*.whl + +RUN python3 -m build /build/RO-VIM-azure && \ + python3 -m pip install /build/RO-VIM-azure/dist/*.whl + +RUN python3 -m build /build/RO-VIM-fos && \ + python3 -m pip install /build/RO-VIM-fos/dist/*.whl + +RUN python3 -m build /build/RO-SDN-dynpac && \ + python3 -m pip install /build/RO-SDN-dynpac/dist/*.whl + +RUN python3 -m build /build/RO-SDN-ietfl2vpn && \ + python3 -m pip install /build/RO-SDN-ietfl2vpn/dist/*.whl + +RUN python3 -m build /build/RO-SDN-onos_vpls && \ + python3 -m pip install /build/RO-SDN-onos_vpls/dist/*.whl + +RUN python3 -m build /build/RO-SDN-onos_openflow && \ + python3 -m pip install /build/RO-SDN-onos_openflow/dist/*.whl + +RUN python3 -m build /build/RO-SDN-odl_openflow && \ + python3 -m pip install /build/RO-SDN-odl_openflow/dist/*.whl + +RUN python3 -m build /build/RO-SDN-floodlight_openflow && \ + python3 -m pip install /build/RO-SDN-floodlight_openflow/dist/*.whl + +RUN python3 -m build /build/RO-SDN-arista_cloudvision && \ + python3 -m pip install /build/RO-SDN-arista_cloudvision/dist/*.whl + +RUN python3 -m build /build/RO-SDN-juniper_contrail && \ + python3 -m pip install /build/RO-SDN-juniper_contrail/dist/*.whl + +FROM ubuntu:18.04 + +RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \ + DEBIAN_FRONTEND=noninteractive apt-get --yes install python3-minimal + +COPY --from=INSTALL /usr/lib/python3/dist-packages /usr/lib/python3/dist-packages +COPY --from=INSTALL /usr/local/lib/python3.6/dist-packages /usr/local/lib/python3.6/dist-packages +COPY --from=INSTALL /usr/bin/genisoimage /usr/bin/genisoimage +COPY --from=INSTALL /etc/protocols /etc/protocols + +VOLUME /var/log/osm + +EXPOSE 9090 + +# Two mysql databases are needed (DB and DB_OVIM). Can be hosted on same or separated containers +# These ENV must be provided +ENV RO_DB_HOST="" +ENV RO_DB_OVIM_HOST="" + # if empty RO_DB_HOST is assumed + +# These ENV should be provided first time for creating database. It will create and init only if empty! +ENV RO_DB_ROOT_PASSWORD="" +ENV RO_DB_OVIM_ROOT_PASSWORD="" + # if empty RO_DB_ROOT_PASSWORD is assumed + +# These ENV can be provided, but default values are ok +ENV RO_DB_USER=mano +ENV RO_DB_OVIM_USER=mano +ENV RO_DB_PASSWORD=manopw +ENV RO_DB_OVIM_PASSWORD=manopw +ENV RO_DB_PORT=3306 +ENV RO_DB_OVIM_PORT=3306 +ENV RO_DB_NAME=mano_db +ENV RO_DB_OVIM_NAME=mano_vim_db +ENV OPENMANO_TENANT=osm + +# database +ENV OSMRO_DATABASE_DRIVER mongo +ENV OSMRO_DATABASE_URI mongodb://mongo:27017 +# ENV OSMRO_DATABASE_COMMONKEY xxx +# ENV OSMRO_DATABASE_USER xxx +# ENV OSMRO_DATABASE_PASSWORD xxx + +# message +ENV OSMRO_MESSAGE_DRIVER kafka +ENV OSMRO_MESSAGE_HOST kafka +ENV OSMRO_MESSAGE_PORT 9092 + +# logs +ENV OSMRO_LOG_LEVEL INFO + +CMD ["python3", "-u", "-m", "osm_ng_ro.ro_main"] diff --git a/Makefile b/Makefile deleted file mode 100644 index 90ee12c3..00000000 --- a/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# 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. - -SUBDIRS := $(wildcard */Makefile) - -all: clean package -clean: $(SUBDIRS) -package: $(SUBDIRS) - -$(SUBDIRS): - $(MAKE) -C $(@:Makefile=) $(MAKECMDGOALS) - -.PHONY: all $(SUBDIRS) - diff --git a/NG-RO/MANIFEST.in b/NG-RO/MANIFEST.in index b774a75e..04f621c5 100644 --- a/NG-RO/MANIFEST.in +++ b/NG-RO/MANIFEST.in @@ -13,5 +13,5 @@ # ## -recursive-include osm_ng_ro *.py *.sh *.cfg *.yml +recursive-include osm_ng_ro *.py *.sh *.cfg *.yml *.txt recursive-include osm_ng_ro/html_public * diff --git a/NG-RO/Makefile b/NG-RO/Makefile deleted file mode 100644 index ee09e5cd..00000000 --- a/NG-RO/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 2020 Telefonica S.A. -# -# 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. - -all: clean package - -clean: - rm -rf dist deb_dist osm_ng_ro-*.tar.gz osm_ng_ro.egg-info .eggs .temp-tox - -package: - python3 setup.py --command-packages=stdeb.command sdist_dsc - cp debian/python3-osm-ng-ro.postinst deb_dist/osm-ng-ro*/debian - cd deb_dist/osm-ng-ro*/ && dpkg-buildpackage -rfakeroot -uc -us diff --git a/NG-RO/debian/python3-osm-ng-ro.postinst b/NG-RO/debian/python3-osm-ng-ro.postinst deleted file mode 100755 index 87416ac9..00000000 --- a/NG-RO/debian/python3-osm-ng-ro.postinst +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash - -## -# 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. -# -# For those usages not covered by the Apache License, Version 2.0 please -# contact with: OSM_TECH@list.etsi.org -## - -echo "POST INSTALL OSM-RO-NG" -echo "Installing python dependencies via pip..." - -# python3 -m pip install -U pip -python3 -m pip install -U "cherrypy==18.1.2" "cryptography>=2.5" diff --git a/NG-RO/osm_ng_ro/__init__.py b/NG-RO/osm_ng_ro/__init__.py index 3f156297..2995bad8 100644 --- a/NG-RO/osm_ng_ro/__init__.py +++ b/NG-RO/osm_ng_ro/__init__.py @@ -1,15 +1,18 @@ -## -# 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 +#!/usr/bin/env python3 +# Copyright ETSI Contributors and Others. +# +# 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 +# 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. +# 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. ## version = "8.0.1.post0" diff --git a/NG-RO/osm_ng_ro/ns.py b/NG-RO/osm_ng_ro/ns.py index e62eef59..9841852a 100644 --- a/NG-RO/osm_ng_ro/ns.py +++ b/NG-RO/osm_ng_ro/ns.py @@ -687,9 +687,7 @@ class Ns(object): "dhcp_start_address": ip_profile.get("dhcp-params", {}).get( "start-address", None ), - "dhcp_count": ip_profile.get("dhcp-params", {}).get( - "count", None - ), + "dhcp_count": ip_profile.get("dhcp-params", {}).get("count", None), } if ip_profile.get("dns-server"): @@ -787,13 +785,13 @@ class Ns(object): extra_dict["depends_on"].append(net_text) if "port-security-enabled" in interface: - interface["port_security"] = ( - interface.pop("port-security-enabled") + interface["port_security"] = interface.pop( + "port-security-enabled" ) if "port-security-disable-strategy" in interface: - interface["port_security_disable_strategy"] = ( - interface.pop("port-security-disable-strategy") + interface["port_security_disable_strategy"] = interface.pop( + "port-security-disable-strategy" ) net_item = { diff --git a/NG-RO/osm_ng_ro/tests/__init__.py b/NG-RO/osm_ng_ro/tests/__init__.py new file mode 100644 index 00000000..04f7d49f --- /dev/null +++ b/NG-RO/osm_ng_ro/tests/__init__.py @@ -0,0 +1,16 @@ +####################################################################################### +# Copyright ETSI Contributors and Others. +# +# 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. +####################################################################################### diff --git a/NG-RO/requirements.in b/NG-RO/requirements.in new file mode 100644 index 00000000..c257ce57 --- /dev/null +++ b/NG-RO/requirements.in @@ -0,0 +1,22 @@ +# Copyright ETSI Contributors and Others. +# +# 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. +## + +PyYAML +CherryPy==18.1.2 +requests +cryptography +logutils +importlib-metadata diff --git a/NG-RO/requirements.txt b/NG-RO/requirements.txt deleted file mode 100644 index 1ff0d6f8..00000000 --- a/NG-RO/requirements.txt +++ /dev/null @@ -1,21 +0,0 @@ -## -# 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. -## - -PyYAML -CherryPy==18.1.2 -osm-common @ git+https://osm.etsi.org/gerrit/osm/common.git@v9.0#egg=osm-common -requests -cryptography -osm-ro-plugin @ git+https://osm.etsi.org/gerrit/osm/RO.git@v9.0#egg=osm-ro-plugin&subdirectory=RO-plugin -logutils diff --git a/NG-RO/setup.py b/NG-RO/setup.py index 4749cd4b..46613860 100644 --- a/NG-RO/setup.py +++ b/NG-RO/setup.py @@ -19,31 +19,29 @@ from setuptools import setup, find_packages _name = "osm_ng_ro" +_version_command = ("git describe --match v* --tags --long --dirty", "pep440-git-full") +_description = "OSM Resource Orchestrator" +_author = "OSM Support" +_author_email = "osmsupport@etsi.org" +_maintainer = "OSM Support" +_maintainer_email = "osmsupport@etsi.org" +_license = "Apache 2.0" +_url = "https://osm.etsi.org/gitweb/?p=osm/RO.git;a=summary" + _readme = "osm-ng-ro is the New Generation Resource Orchestrator for OSM" + setup( name=_name, - description="OSM Resource Orchestrator", + description=_description, long_description=_readme, - version_command=( - "git describe --match v* --tags --long --dirty", - "pep440-git-full", - ), - author="ETSI OSM", - author_email="alfonso.tiernosepulveda@telefonica.com", - maintainer="Alfonso Tierno", - maintainer_email="alfonso.tiernosepulveda@telefonica.com", - url="https://osm.etsi.org/gitweb/?p=osm/RO.git;a=summary", - license="Apache 2.0", + version_command=_version_command, + author=_author, + author_email=_author_email, + maintainer=_maintainer, + maintainer_email=_maintainer_email, + url=_url, + license=_license, packages=find_packages(exclude=["temp", "local"]), include_package_data=True, - install_requires=[ - "CherryPy==18.1.2", - "osm-common", - "jsonschema", - "PyYAML", - "requests", - "cryptography", # >=2.5 installed right version with the debian post-install script - "osm-ro-plugin", - ], setup_requires=["setuptools-version-command"], ) diff --git a/NG-RO/stdeb.cfg b/NG-RO/stdeb.cfg index d111b745..074f69a1 100644 --- a/NG-RO/stdeb.cfg +++ b/NG-RO/stdeb.cfg @@ -12,5 +12,3 @@ [DEFAULT] X-Python3-Version : >= 3.5 -Depends3 : python3-osm-common, python3-cherrypy3, python3-yaml, python3-jsonschema, - python3-pip, python3-requests, python3-osm-ro-plugin diff --git a/NG-RO/tox.ini b/NG-RO/tox.ini deleted file mode 100644 index fe012728..00000000 --- a/NG-RO/tox.ini +++ /dev/null @@ -1,33 +0,0 @@ -# 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. - -[tox] -envlist = flake8 -toxworkdir={toxinidir}/../.tox - -[testenv] -usedevelop = True -basepython = python3 -install_command = python3 -m pip install -r requirements.txt -U {opts} {packages} - -[testenv:flake8] -basepython = python3 -deps = flake8 -commands = flake8 osm_ng_ro --max-line-length 120 \ - --exclude .svn,CVS,.gz,.git,__pycache__,.tox,local,temp,osm_im --ignore W291,W293,W503,W605,E123,E125,E203,E226,E241 - -[testenv:build] -basepython = python3 -deps = stdeb - setuptools-version-command -commands = python3 setup.py --command-packages=stdeb.command bdist_deb diff --git a/RO-SDN-arista_cloudvision/Makefile b/RO-SDN-arista_cloudvision/Makefile deleted file mode 100644 index 4890e8e3..00000000 --- a/RO-SDN-arista_cloudvision/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -## -# 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. -## - -all: clean package - -clean: - rm -rf dist deb_dist osm_rosdn_arista_cloudvision-*.tar.gz osm_rosdn_arista_cloudvision.egg-info .eggs - -package: - python3 setup.py --command-packages=stdeb.command sdist_dsc - cp debian/python3-osm-rosdn-arista-cloudvision.postinst deb_dist/osm-rosdn-arista-cloudvision*/debian/ - cd deb_dist/osm-rosdn-arista-cloudvision*/ && dpkg-buildpackage -rfakeroot -uc -us - diff --git a/RO-SDN-arista_cloudvision/debian/python3-osm-rosdn-arista-cloudvision.postinst b/RO-SDN-arista_cloudvision/debian/python3-osm-rosdn-arista-cloudvision.postinst deleted file mode 100755 index d87fa261..00000000 --- a/RO-SDN-arista_cloudvision/debian/python3-osm-rosdn-arista-cloudvision.postinst +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash - -## -# 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. -# -# For those usages not covered by the Apache License, Version 2.0 please -# contact with: OSM_TECH@list.etsi.org -## - -echo "POST INSTALL OSM-ROSDN-ARISTA" - -#Pip packages required for openstack connector -python3 -m pip install cvprac diff --git a/RO-SDN-arista_cloudvision/osm_rosdn_arista_cloudvision/__init__.py b/RO-SDN-arista_cloudvision/osm_rosdn_arista_cloudvision/__init__.py new file mode 100644 index 00000000..94a6a32d --- /dev/null +++ b/RO-SDN-arista_cloudvision/osm_rosdn_arista_cloudvision/__init__.py @@ -0,0 +1,16 @@ +#!/usr/bin/env python3 +# Copyright ETSI Contributors and Others. +# +# 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. +## diff --git a/RO-SDN-arista_cloudvision/osm_rosdn_arista_cloudvision/tests/__init__.py b/RO-SDN-arista_cloudvision/osm_rosdn_arista_cloudvision/tests/__init__.py new file mode 100644 index 00000000..04f7d49f --- /dev/null +++ b/RO-SDN-arista_cloudvision/osm_rosdn_arista_cloudvision/tests/__init__.py @@ -0,0 +1,16 @@ +####################################################################################### +# Copyright ETSI Contributors and Others. +# +# 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. +####################################################################################### diff --git a/RO-SDN-arista_cloudvision/requirements.in b/RO-SDN-arista_cloudvision/requirements.in new file mode 100644 index 00000000..feffc3fb --- /dev/null +++ b/RO-SDN-arista_cloudvision/requirements.in @@ -0,0 +1,19 @@ +# Copyright ETSI Contributors and Others. +# +# 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. +## + +requests +uuid +cvprac diff --git a/RO-SDN-arista_cloudvision/requirements.txt b/RO-SDN-arista_cloudvision/requirements.txt deleted file mode 100644 index a4ac97e9..00000000 --- a/RO-SDN-arista_cloudvision/requirements.txt +++ /dev/null @@ -1,19 +0,0 @@ -## -# 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. -## - -requests -uuid -cvprac -git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin diff --git a/RO-SDN-arista_cloudvision/setup.py b/RO-SDN-arista_cloudvision/setup.py index cf1257e2..09647c38 100644 --- a/RO-SDN-arista_cloudvision/setup.py +++ b/RO-SDN-arista_cloudvision/setup.py @@ -19,8 +19,16 @@ from setuptools import setup _name = "osm_rosdn_arista_cloudvision" +_version_command = ("git describe --match v* --tags --long --dirty", "pep440-git-full") +_description = "OSM ro sdn plugin for arista with CloudVision" +_author = "OSM Support" +_author_email = "osmsupport@etsi.org" +_maintainer = "OSM Support" +_maintainer_email = "osmsupport@etsi.org" +_license = "Apache 2.0" +_url = "https://osm.etsi.org/gitweb/?p=osm/RO.git;a=summary" -README = """ +_readme = """ =========== osm-rosdn_arista_cloudvision =========== @@ -30,28 +38,17 @@ osm-ro pluging for arista_cloudvision SDN setup( name=_name, - description="OSM ro sdn plugin for arista with CloudVision", - long_description=README, - version_command=( - "git describe --match v* --tags --long --dirty", - "pep440-git-full", - ), - # version=VERSION, - # python_requires='>3.5.0', - author="ETSI OSM", - author_email="OSM_TECH@LIST.ETSI.ORG", - maintainer="Oscar Luis Peral", - maintainer_email="oscarluis.peral@atos.net", - url="https://osm.etsi.org/gitweb/?p=osm/RO.git;a=summary", - license="Apache 2.0", + description=_description, + long_description=_readme, + version_command=_version_command, + author=_author, + author_email=_author_email, + maintainer=_maintainer, + maintainer_email=_maintainer_email, + url=_url, + license=_license, packages=[_name], include_package_data=True, - install_requires=[ - "requests", - "uuid", - "cvprac", - "osm-ro-plugin @ git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin", - ], setup_requires=["setuptools-version-command"], entry_points={ "osm_rosdn.plugins": [ diff --git a/RO-SDN-arista_cloudvision/stdeb.cfg b/RO-SDN-arista_cloudvision/stdeb.cfg index d1ff8c69..262a47c8 100644 --- a/RO-SDN-arista_cloudvision/stdeb.cfg +++ b/RO-SDN-arista_cloudvision/stdeb.cfg @@ -15,5 +15,3 @@ [DEFAULT] X-Python3-Version : >= 3.5 -Depends3: python3-requests, python3-osm-ro-plugin, python3-pip - diff --git a/RO-SDN-arista_cloudvision/tox.ini b/RO-SDN-arista_cloudvision/tox.ini deleted file mode 100644 index cfad8e99..00000000 --- a/RO-SDN-arista_cloudvision/tox.ini +++ /dev/null @@ -1,41 +0,0 @@ -## -# 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. -## - -[tox] -envlist = flake8 -toxworkdir={toxinidir}/../.tox - -[testenv] -basepython = python3 -install_command = python3 -m pip install -r requirements.txt -U {opts} {packages} -# deps = -r{toxinidir}/test-requirements.txt -# commands=python3 -m unittest discover -v - -[testenv:flake8] -basepython = python3 -deps = flake8 -commands = flake8 osm_rosdn_arista_cloudvision --max-line-length 120 \ - --exclude .svn,CVS,.gz,.git,__pycache__,.tox,local,temp --ignore W291,W293,W503,W605,E123,E125,E203,E226,E241 - -[testenv:unittest] -basepython = python3 -commands = python3 -m unittest osm_rosdn_arista_cloudvision.tests - -[testenv:build] -basepython = python3 -deps = stdeb - setuptools-version-command -commands = python3 setup.py --command-packages=stdeb.command bdist_deb - diff --git a/RO-SDN-dpb/Makefile b/RO-SDN-dpb/Makefile deleted file mode 100644 index 20be75cf..00000000 --- a/RO-SDN-dpb/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -## -# 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. -## - -all: clean package - -clean: - rm -rf dist deb_dist osm_rosdn_dpb-*.tar.gz osm_rosdn_dpb.egg-info .eggs - -package: - python3 setup.py --command-packages=stdeb.command sdist_dsc - cd deb_dist/osm-rosdn-dpb*/ && dpkg-buildpackage -rfakeroot -uc -us - diff --git a/RO-SDN-dpb/osm_rosdn_dpb/__init__.py b/RO-SDN-dpb/osm_rosdn_dpb/__init__.py new file mode 100644 index 00000000..94a6a32d --- /dev/null +++ b/RO-SDN-dpb/osm_rosdn_dpb/__init__.py @@ -0,0 +1,16 @@ +#!/usr/bin/env python3 +# Copyright ETSI Contributors and Others. +# +# 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. +## diff --git a/RO-SDN-dpb/osm_rosdn_dpb/tests/__init__.py b/RO-SDN-dpb/osm_rosdn_dpb/tests/__init__.py new file mode 100644 index 00000000..04f7d49f --- /dev/null +++ b/RO-SDN-dpb/osm_rosdn_dpb/tests/__init__.py @@ -0,0 +1,16 @@ +####################################################################################### +# Copyright ETSI Contributors and Others. +# +# 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. +####################################################################################### diff --git a/RO-SDN-dpb/requirements.in b/RO-SDN-dpb/requirements.in new file mode 100644 index 00000000..c10fc3c9 --- /dev/null +++ b/RO-SDN-dpb/requirements.in @@ -0,0 +1,18 @@ +# Copyright ETSI Contributors and Others. +# +# 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. +## + +paramiko +requests diff --git a/RO-SDN-dpb/requirements.txt b/RO-SDN-dpb/requirements.txt deleted file mode 100644 index 354756f6..00000000 --- a/RO-SDN-dpb/requirements.txt +++ /dev/null @@ -1,20 +0,0 @@ -## -# 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. -## - -paramiko -requests -git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin - - diff --git a/RO-SDN-dpb/setup.py b/RO-SDN-dpb/setup.py index e2afbc24..b722a1a9 100644 --- a/RO-SDN-dpb/setup.py +++ b/RO-SDN-dpb/setup.py @@ -19,8 +19,16 @@ from setuptools import setup _name = "osm_rosdn_dpb" +_version_command = ("git describe --match v* --tags --long --dirty", "pep440-git-full") +_description = "OSM ro sdn plugin for dpb" +_author = "OSM Support" +_author_email = "osmsupport@etsi.org" +_maintainer = "OSM Support" +_maintainer_email = "osmsupport@etsi.org" +_license = "Apache 2.0" +_url = "https://osm.etsi.org/gitweb/?p=osm/RO.git;a=summary" -README = """ +_readme = """ =========== osm-rosdn_dpb =========== @@ -30,27 +38,17 @@ osm-ro plugin for dpb SDN setup( name=_name, - description="OSM ro sdn plugin for dpb", - long_description=README, - version_command=( - "git describe --match v* --tags --long --dirty", - "pep440-git-full", - ), - # version=VERSION, - # python_requires='>3.5.0', - author="ETSI OSM", - author_email="OSM_TECH@LIST.ETSI.ORG'", - maintainer="ETSI OSM", - maintainer_email="OSM_TECH@LIST.ETSI.ORG", - url="https://osm.etsi.org/gitweb/?p=osm/RO.git;a=summary", - license="Apache 2.0", + description=_description, + long_description=_readme, + version_command=_version_command, + author=_author, + author_email=_author_email, + maintainer=_maintainer, + maintainer_email=_maintainer_email, + url=_url, + license=_license, packages=[_name], include_package_data=True, - install_requires=[ - "paramiko", - "requests", - "osm-ro-plugin @ git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin", - ], setup_requires=["setuptools-version-command"], entry_points={ "osm_rosdn.plugins": ["rosdn_dpb = osm_rosdn_dpb.wimconn_dpb:DpbConnector"], diff --git a/RO-SDN-dpb/stdeb.cfg b/RO-SDN-dpb/stdeb.cfg index c2228dff..262a47c8 100644 --- a/RO-SDN-dpb/stdeb.cfg +++ b/RO-SDN-dpb/stdeb.cfg @@ -15,5 +15,3 @@ [DEFAULT] X-Python3-Version : >= 3.5 -Depends3: python3-paramiko, python3-requests, python3-osm-ro-plugin - diff --git a/RO-SDN-dpb/tox.ini b/RO-SDN-dpb/tox.ini deleted file mode 100644 index e223da48..00000000 --- a/RO-SDN-dpb/tox.ini +++ /dev/null @@ -1,41 +0,0 @@ -## -# 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. -## - -[tox] -envlist = flake8 -toxworkdir={toxinidir}/../.tox - -[testenv] -basepython = python3 -install_command = python3 -m pip install -r requirements.txt -U {opts} {packages} -# deps = -r{toxinidir}/test-requirements.txt -commands=python3 -m unittest discover -v - -[testenv:flake8] -basepython = python3 -deps = flake8 -commands = flake8 osm_rosdn_dpb --max-line-length 120 \ - --exclude .svn,CVS,.gz,.git,__pycache__,.tox,local,temp --ignore W291,W293,W503,W605,E123,E125,E203,E226,E241 - -[testenv:unittest] -basepython = python3 -commands = python3 -m unittest osm_rosdn_dpb.tests - -[testenv:build] -basepython = python3 -deps = stdeb - setuptools-version-command -commands = python3 setup.py --command-packages=stdeb.command bdist_deb - diff --git a/RO-SDN-dynpac/Makefile b/RO-SDN-dynpac/Makefile deleted file mode 100644 index 9fb4408b..00000000 --- a/RO-SDN-dynpac/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -## -# 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. -## - -all: clean package - -clean: - rm -rf dist deb_dist osm_rosdn_dynpac-*.tar.gz osm_rosdn_dynpac.egg-info .eggs - -package: - python3 setup.py --command-packages=stdeb.command sdist_dsc - cd deb_dist/osm-rosdn-dynpac*/ && dpkg-buildpackage -rfakeroot -uc -us - diff --git a/RO-SDN-dynpac/osm_rosdn_dynpac/__init__.py b/RO-SDN-dynpac/osm_rosdn_dynpac/__init__.py new file mode 100644 index 00000000..94a6a32d --- /dev/null +++ b/RO-SDN-dynpac/osm_rosdn_dynpac/__init__.py @@ -0,0 +1,16 @@ +#!/usr/bin/env python3 +# Copyright ETSI Contributors and Others. +# +# 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. +## diff --git a/RO-SDN-dynpac/osm_rosdn_dynpac/tests/__init__.py b/RO-SDN-dynpac/osm_rosdn_dynpac/tests/__init__.py new file mode 100644 index 00000000..04f7d49f --- /dev/null +++ b/RO-SDN-dynpac/osm_rosdn_dynpac/tests/__init__.py @@ -0,0 +1,16 @@ +####################################################################################### +# Copyright ETSI Contributors and Others. +# +# 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. +####################################################################################### diff --git a/RO-SDN-dynpac/requirements.in b/RO-SDN-dynpac/requirements.in new file mode 100644 index 00000000..25e572e9 --- /dev/null +++ b/RO-SDN-dynpac/requirements.in @@ -0,0 +1,17 @@ +# Copyright ETSI Contributors and Others. +# +# 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. +## + +requests diff --git a/RO-SDN-dynpac/requirements.txt b/RO-SDN-dynpac/requirements.txt deleted file mode 100644 index 0a169e4e..00000000 --- a/RO-SDN-dynpac/requirements.txt +++ /dev/null @@ -1,17 +0,0 @@ -## -# 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. -## - -requests -osm-ro-plugin @ git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin diff --git a/RO-SDN-dynpac/setup.py b/RO-SDN-dynpac/setup.py index ba496225..79f73ad4 100644 --- a/RO-SDN-dynpac/setup.py +++ b/RO-SDN-dynpac/setup.py @@ -19,8 +19,16 @@ from setuptools import setup _name = "osm_rosdn_dynpac" +_version_command = ("git describe --match v* --tags --long --dirty", "pep440-git-full") +_description = "OSM ro sdn plugin for dynpac" +_author = "OSM Support" +_author_email = "osmsupport@etsi.org" +_maintainer = "OSM Support" +_maintainer_email = "osmsupport@etsi.org" +_license = "Apache 2.0" +_url = "https://osm.etsi.org/gitweb/?p=osm/RO.git;a=summary" -README = """ +_readme = """ =========== osm-rosdn_dynpac =========== @@ -30,26 +38,17 @@ osm-ro pluging for dynpac SDN setup( name=_name, - description="OSM ro sdn plugin for dynpac", - long_description=README, - version_command=( - "git describe --match v* --tags --long --dirty", - "pep440-git-full", - ), - # version=VERSION, - # python_requires='>3.5.0', - author="ETSI OSM", - author_email="OSM_TECH@LIST.ETSI.ORG", - maintainer="ETSI OSM", - maintainer_email="OSM_TECH@LIST.ETSI.ORG", - url="https://osm.etsi.org/gitweb/?p=osm/RO.git;a=summary", - license="Apache 2.0", + description=_description, + long_description=_readme, + version_command=_version_command, + author=_author, + author_email=_author_email, + maintainer=_maintainer, + maintainer_email=_maintainer_email, + url=_url, + license=_license, packages=[_name], include_package_data=True, - install_requires=[ - "requests", - "osm-ro-plugin @ git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin", - ], setup_requires=["setuptools-version-command"], entry_points={ "osm_rosdn.plugins": [ diff --git a/RO-SDN-dynpac/stdeb.cfg b/RO-SDN-dynpac/stdeb.cfg index dea4d923..262a47c8 100644 --- a/RO-SDN-dynpac/stdeb.cfg +++ b/RO-SDN-dynpac/stdeb.cfg @@ -15,5 +15,3 @@ [DEFAULT] X-Python3-Version : >= 3.5 -Depends3: python3-requests, python3-osm-ro-plugin - diff --git a/RO-SDN-dynpac/tox.ini b/RO-SDN-dynpac/tox.ini deleted file mode 100644 index cc6443f7..00000000 --- a/RO-SDN-dynpac/tox.ini +++ /dev/null @@ -1,40 +0,0 @@ -## -# 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. -## - -[tox] -envlist = flake8 -toxworkdir={toxinidir}/../.tox - -[testenv] -usedevelop = True -basepython = python3 -install_command = python3 -m pip install -r requirements.txt -U {opts} {packages} - -[testenv:flake8] -basepython = python3 -deps = flake8 -commands = flake8 osm_rosdn_dynpac --max-line-length 120 \ - --exclude .svn,CVS,.gz,.git,__pycache__,.tox,local,temp --ignore W291,W293,W503,W605,E123,E125,E203,E226,E241 - -[testenv:unittest] -basepython = python3 -commands = python3 -m unittest osm_rosdn_dynpac.tests - -[testenv:build] -basepython = python3 -deps = stdeb - setuptools-version-command -commands = python3 setup.py --command-packages=stdeb.command bdist_deb - diff --git a/RO-SDN-floodlight_openflow/Makefile b/RO-SDN-floodlight_openflow/Makefile deleted file mode 100644 index c1965f33..00000000 --- a/RO-SDN-floodlight_openflow/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -## -# 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. -## - -all: clean package - -clean: - rm -rf dist deb_dist osm_rosdn_floodlightof-*.tar.gz osm_rosdn_floodlightof.egg-info .eggs - -package: - python3 setup.py --command-packages=stdeb.command sdist_dsc - cd deb_dist/osm-rosdn-floodlightof*/ && dpkg-buildpackage -rfakeroot -uc -us - diff --git a/RO-SDN-floodlight_openflow/osm_rosdn_floodlightof/__init__.py b/RO-SDN-floodlight_openflow/osm_rosdn_floodlightof/__init__.py new file mode 100644 index 00000000..94a6a32d --- /dev/null +++ b/RO-SDN-floodlight_openflow/osm_rosdn_floodlightof/__init__.py @@ -0,0 +1,16 @@ +#!/usr/bin/env python3 +# Copyright ETSI Contributors and Others. +# +# 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. +## diff --git a/RO-SDN-floodlight_openflow/osm_rosdn_floodlightof/tests/__init__.py b/RO-SDN-floodlight_openflow/osm_rosdn_floodlightof/tests/__init__.py new file mode 100644 index 00000000..04f7d49f --- /dev/null +++ b/RO-SDN-floodlight_openflow/osm_rosdn_floodlightof/tests/__init__.py @@ -0,0 +1,16 @@ +####################################################################################### +# Copyright ETSI Contributors and Others. +# +# 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. +####################################################################################### diff --git a/RO-SDN-floodlight_openflow/requirements.in b/RO-SDN-floodlight_openflow/requirements.in new file mode 100644 index 00000000..25e572e9 --- /dev/null +++ b/RO-SDN-floodlight_openflow/requirements.in @@ -0,0 +1,17 @@ +# Copyright ETSI Contributors and Others. +# +# 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. +## + +requests diff --git a/RO-SDN-floodlight_openflow/requirements.txt b/RO-SDN-floodlight_openflow/requirements.txt deleted file mode 100644 index 37366789..00000000 --- a/RO-SDN-floodlight_openflow/requirements.txt +++ /dev/null @@ -1,17 +0,0 @@ -## -# 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. -## - -requests -git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin diff --git a/RO-SDN-floodlight_openflow/setup.py b/RO-SDN-floodlight_openflow/setup.py index ce1fabde..7956b4a6 100644 --- a/RO-SDN-floodlight_openflow/setup.py +++ b/RO-SDN-floodlight_openflow/setup.py @@ -19,8 +19,16 @@ from setuptools import setup _name = "osm_rosdn_floodlightof" +_version_command = ("git describe --match v* --tags --long --dirty", "pep440-git-full") +_description = "OSM RO plugin for SDN with floodlight openflow rules" +_author = "OSM Support" +_author_email = "osmsupport@etsi.org" +_maintainer = "OSM Support" +_maintainer_email = "osmsupport@etsi.org" +_license = "Apache 2.0" +_url = "https://osm.etsi.org/gitweb/?p=osm/RO.git;a=summary" -README = """ +_readme = """ =========== osm-rosdn_floodlightof =========== @@ -30,26 +38,17 @@ osm-ro plugin for floodlight SDN using pre-computed openflow rules setup( name=_name, - description="OSM RO plugin for SDN with floodlight openflow rules", - long_description=README, - version_command=( - "git describe --match v* --tags --long --dirty", - "pep440-git-full", - ), - # version=VERSION, - # python_requires='>3.5.0', - author="ETSI OSM", - author_email="alfonso.tiernosepulveda@telefonica.com", - maintainer="Alfonso Tierno", - maintainer_email="alfonso.tiernosepulveda@telefonica.com", - url="https://osm.etsi.org/gitweb/?p=osm/RO.git;a=summary", - license="Apache 2.0", + description=_description, + long_description=_readme, + version_command=_version_command, + author=_author, + author_email=_author_email, + maintainer=_maintainer, + maintainer_email=_maintainer_email, + url=_url, + license=_license, packages=[_name], include_package_data=True, - install_requires=[ - "requests", - "osm-ro-plugin @ git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin", - ], setup_requires=["setuptools-version-command"], entry_points={ "osm_rosdn.plugins": [ diff --git a/RO-SDN-floodlight_openflow/stdeb.cfg b/RO-SDN-floodlight_openflow/stdeb.cfg index f5f8e839..262a47c8 100644 --- a/RO-SDN-floodlight_openflow/stdeb.cfg +++ b/RO-SDN-floodlight_openflow/stdeb.cfg @@ -15,5 +15,3 @@ [DEFAULT] X-Python3-Version : >= 3.5 -Maintainer: Alfonso Tierno -Depends3: python3-requests, python3-osm-ro-plugin diff --git a/RO-SDN-floodlight_openflow/tox.ini b/RO-SDN-floodlight_openflow/tox.ini deleted file mode 100644 index 2312e5f3..00000000 --- a/RO-SDN-floodlight_openflow/tox.ini +++ /dev/null @@ -1,41 +0,0 @@ -## -# 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. -## - -[tox] -envlist = flake8 -toxworkdir={toxinidir}/../.tox - -[testenv] -basepython = python3 -install_command = python3 -m pip install -r requirements.txt -U {opts} {packages} -# deps = -r{toxinidir}/test-requirements.txt -commands=python3 -m unittest discover -v - -[testenv:flake8] -basepython = python3 -deps = flake8 -commands = flake8 osm_rosdn_floodlightof --max-line-length 120 \ - --exclude .svn,CVS,.gz,.git,__pycache__,.tox,local,temp --ignore W291,W293,W503,W605,E123,E125,E203,E226,E241 - -[testenv:unittest] -basepython = python3 -commands = python3 -m unittest osm_rosdn_floodlightof.tests - -[testenv:build] -basepython = python3 -deps = stdeb - setuptools-version-command -commands = python3 setup.py --command-packages=stdeb.command bdist_deb - diff --git a/RO-SDN-ietfl2vpn/Makefile b/RO-SDN-ietfl2vpn/Makefile deleted file mode 100644 index c88b0740..00000000 --- a/RO-SDN-ietfl2vpn/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -## -# 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. -## - -all: clean package - -clean: - rm -rf dist deb_dist osm_rosdn_ietfl2vpn-*.tar.gz osm_rosdn_ietfl2vpn.egg-info .eggs - rm -rf osm_rosdn_tapi-*.tar.gz osm_rosdn_tapi.egg-info - -package: - python3 setup.py --command-packages=stdeb.command sdist_dsc - cd deb_dist/osm-rosdn-ietfl2vpn*/ && dpkg-buildpackage -rfakeroot -uc -us - for pkg in deb_dist/python3-osm-rosdn-ietfl2vpn*.deb; do cp $$pkg deb_dist/python3-osm-rosdn-tapi$${pkg#*-osm-rosdn-ietfl2vpn} ; done - diff --git a/RO-SDN-ietfl2vpn/osm_rosdn_ietfl2vpn/__init__.py b/RO-SDN-ietfl2vpn/osm_rosdn_ietfl2vpn/__init__.py new file mode 100644 index 00000000..94a6a32d --- /dev/null +++ b/RO-SDN-ietfl2vpn/osm_rosdn_ietfl2vpn/__init__.py @@ -0,0 +1,16 @@ +#!/usr/bin/env python3 +# Copyright ETSI Contributors and Others. +# +# 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. +## diff --git a/RO-SDN-ietfl2vpn/osm_rosdn_ietfl2vpn/tests/__init__.py b/RO-SDN-ietfl2vpn/osm_rosdn_ietfl2vpn/tests/__init__.py new file mode 100644 index 00000000..04f7d49f --- /dev/null +++ b/RO-SDN-ietfl2vpn/osm_rosdn_ietfl2vpn/tests/__init__.py @@ -0,0 +1,16 @@ +####################################################################################### +# Copyright ETSI Contributors and Others. +# +# 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. +####################################################################################### diff --git a/RO-SDN-ietfl2vpn/requirements.in b/RO-SDN-ietfl2vpn/requirements.in new file mode 100644 index 00000000..25e572e9 --- /dev/null +++ b/RO-SDN-ietfl2vpn/requirements.in @@ -0,0 +1,17 @@ +# Copyright ETSI Contributors and Others. +# +# 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. +## + +requests diff --git a/RO-SDN-ietfl2vpn/requirements.txt b/RO-SDN-ietfl2vpn/requirements.txt deleted file mode 100644 index 37366789..00000000 --- a/RO-SDN-ietfl2vpn/requirements.txt +++ /dev/null @@ -1,17 +0,0 @@ -## -# 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. -## - -requests -git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin diff --git a/RO-SDN-ietfl2vpn/setup.py b/RO-SDN-ietfl2vpn/setup.py index 3295387a..86b3f892 100644 --- a/RO-SDN-ietfl2vpn/setup.py +++ b/RO-SDN-ietfl2vpn/setup.py @@ -19,8 +19,16 @@ from setuptools import setup _name = "osm_rosdn_ietfl2vpn" +_version_command = ("git describe --match v* --tags --long --dirty", "pep440-git-full") +_description = "OSM ro sdn plugin for ietfl2vpn" +_author = "OSM Support" +_author_email = "osmsupport@etsi.org" +_maintainer = "OSM Support" +_maintainer_email = "osmsupport@etsi.org" +_license = "Apache 2.0" +_url = "https://osm.etsi.org/gitweb/?p=osm/RO.git;a=summary" -README = """ +_readme = """ =========== osm-rosdn_ietfl2vpn =========== @@ -30,26 +38,17 @@ osm-ro pluging for ietfl2vpn SDN setup( name=_name, - description="OSM ro sdn plugin for ietfl2vpn", - long_description=README, - version_command=( - "git describe --match v* --tags --long --dirty", - "pep440-git-full", - ), - # version=VERSION, - # python_requires='>3.5.0', - author="ETSI OSM", - author_email="OSM_TECH@LIST.ETSI.ORG", - maintainer="ETSI OSM", - maintainer_email="OSM_TECH@LIST.ETSI.ORG", - url="https://osm.etsi.org/gitweb/?p=osm/RO.git;a=summary", - license="Apache 2.0", + description=_description, + long_description=_readme, + version_command=_version_command, + author=_author, + author_email=_author_email, + maintainer=_maintainer, + maintainer_email=_maintainer_email, + url=_url, + license=_license, packages=[_name], include_package_data=True, - install_requires=[ - "requests", - "osm-ro-plugin @ git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin", - ], setup_requires=["setuptools-version-command"], entry_points={ "osm_rosdn.plugins": [ diff --git a/RO-SDN-ietfl2vpn/stdeb.cfg b/RO-SDN-ietfl2vpn/stdeb.cfg index dea4d923..262a47c8 100644 --- a/RO-SDN-ietfl2vpn/stdeb.cfg +++ b/RO-SDN-ietfl2vpn/stdeb.cfg @@ -15,5 +15,3 @@ [DEFAULT] X-Python3-Version : >= 3.5 -Depends3: python3-requests, python3-osm-ro-plugin - diff --git a/RO-SDN-ietfl2vpn/tox.ini b/RO-SDN-ietfl2vpn/tox.ini deleted file mode 100644 index 98e35a0b..00000000 --- a/RO-SDN-ietfl2vpn/tox.ini +++ /dev/null @@ -1,41 +0,0 @@ -## -# 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. -## - -[tox] -envlist = flake8 -toxworkdir={toxinidir}/../.tox - -[testenv] -basepython = python3 -install_command = python3 -m pip install -r requirements.txt -U {opts} {packages} -# deps = -r{toxinidir}/test-requirements.txt -commands=python3 -m unittest discover -v - -[testenv:flake8] -basepython = python3 -deps = flake8 -commands = flake8 osm_rosdn_ietfl2vpn --max-line-length 120 \ - --exclude .svn,CVS,.gz,.git,__pycache__,.tox,local,temp --ignore W291,W293,W503,W605,E123,E125,E203,E226,E241 - -[testenv:unittest] -basepython = python3 -commands = python3 -m unittest osm_rosdn_ietfl2vpn.tests - -[testenv:build] -basepython = python3 -deps = stdeb - setuptools-version-command -commands = python3 setup.py --command-packages=stdeb.command bdist_deb - diff --git a/RO-SDN-juniper_contrail/Makefile b/RO-SDN-juniper_contrail/Makefile deleted file mode 100644 index ad691c6a..00000000 --- a/RO-SDN-juniper_contrail/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -## -# 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. -## - -all: clean package - -clean: - rm -rf dist deb_dist osm_rosdn_juniper_contrail-*.tar.gz osm_rosdn_juniper_contrail.egg-info .eggs - -package: - python3 setup.py --command-packages=stdeb.command sdist_dsc - cd deb_dist/osm-rosdn-juniper-contrail*/ && dpkg-buildpackage -rfakeroot -uc -us - diff --git a/RO-SDN-juniper_contrail/osm_rosdn_juniper_contrail/__init__.py b/RO-SDN-juniper_contrail/osm_rosdn_juniper_contrail/__init__.py new file mode 100644 index 00000000..94a6a32d --- /dev/null +++ b/RO-SDN-juniper_contrail/osm_rosdn_juniper_contrail/__init__.py @@ -0,0 +1,16 @@ +#!/usr/bin/env python3 +# Copyright ETSI Contributors and Others. +# +# 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. +## diff --git a/RO-SDN-juniper_contrail/osm_rosdn_juniper_contrail/tests/__init__.py b/RO-SDN-juniper_contrail/osm_rosdn_juniper_contrail/tests/__init__.py new file mode 100644 index 00000000..04f7d49f --- /dev/null +++ b/RO-SDN-juniper_contrail/osm_rosdn_juniper_contrail/tests/__init__.py @@ -0,0 +1,16 @@ +####################################################################################### +# Copyright ETSI Contributors and Others. +# +# 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. +####################################################################################### diff --git a/RO-SDN-juniper_contrail/requirements.in b/RO-SDN-juniper_contrail/requirements.in new file mode 100644 index 00000000..25e572e9 --- /dev/null +++ b/RO-SDN-juniper_contrail/requirements.in @@ -0,0 +1,17 @@ +# Copyright ETSI Contributors and Others. +# +# 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. +## + +requests diff --git a/RO-SDN-juniper_contrail/requirements.txt b/RO-SDN-juniper_contrail/requirements.txt deleted file mode 100644 index 37366789..00000000 --- a/RO-SDN-juniper_contrail/requirements.txt +++ /dev/null @@ -1,17 +0,0 @@ -## -# 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. -## - -requests -git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin diff --git a/RO-SDN-juniper_contrail/setup.py b/RO-SDN-juniper_contrail/setup.py index 4f158e56..659ea354 100644 --- a/RO-SDN-juniper_contrail/setup.py +++ b/RO-SDN-juniper_contrail/setup.py @@ -19,8 +19,16 @@ from setuptools import setup _name = "osm_rosdn_juniper_contrail" +_version_command = ("git describe --match v* --tags --long --dirty", "pep440-git-full") +_description = "OSM RO SDN plugin for Juniper Contrail" +_author = "OSM Support" +_author_email = "osmsupport@etsi.org" +_maintainer = "OSM Support" +_maintainer_email = "osmsupport@etsi.org" +_license = "Apache 2.0" +_url = "https://osm.etsi.org/gitweb/?p=osm/RO.git;a=summary" -README = """ +_readme = """ =========== osm-rosdn_juniper_contrail =========== @@ -30,27 +38,17 @@ osm-ro plugin for Juniper Contrail SDN setup( name=_name, - description="OSM RO SDN plugin for Juniper Contrail", - long_description=README, - version_command=( - "git describe --match v* --tags --long --dirty", - "pep440-git-full", - ), - # version=VERSION, - # python_requires='>3.5.0', - author="ETSI OSM", - author_email="OSM_TECH@list.etsi.org", - maintainer="ETSI OSM", - maintainer_email="OSM_TECH@list.etsi.org", - url="https://osm.etsi.org/gitweb/?p=osm/RO.git;a=summary", - license="Apache 2.0", + description=_description, + long_description=_readme, + version_command=_version_command, + author=_author, + author_email=_author_email, + maintainer=_maintainer, + maintainer_email=_maintainer_email, + url=_url, + license=_license, packages=[_name], include_package_data=True, - # dependency_links=["git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro"], - install_requires=[ - "requests", - "osm-ro-plugin @ git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin", - ], setup_requires=["setuptools-version-command"], entry_points={ "osm_rosdn.plugins": [ diff --git a/RO-SDN-juniper_contrail/stdeb.cfg b/RO-SDN-juniper_contrail/stdeb.cfg index dea4d923..262a47c8 100644 --- a/RO-SDN-juniper_contrail/stdeb.cfg +++ b/RO-SDN-juniper_contrail/stdeb.cfg @@ -15,5 +15,3 @@ [DEFAULT] X-Python3-Version : >= 3.5 -Depends3: python3-requests, python3-osm-ro-plugin - diff --git a/RO-SDN-juniper_contrail/tox.ini b/RO-SDN-juniper_contrail/tox.ini deleted file mode 100644 index 32a16102..00000000 --- a/RO-SDN-juniper_contrail/tox.ini +++ /dev/null @@ -1,41 +0,0 @@ -## -# 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. -## - -[tox] -envlist = flake8 -toxworkdir={toxinidir}/../.tox - -[testenv] -basepython = python3 -install_command = python3 -m pip install -r requirements.txt -U {opts} {packages} -# deps = -r{toxinidir}/test-requirements.txt -commands=python3 -m unittest discover -v - -[testenv:flake8] -basepython = python3 -deps = flake8 -commands = flake8 osm_rosdn_juniper_contrail --max-line-length 120 \ - --exclude .svn,CVS,.gz,.git,__pycache__,.tox,local,temp --ignore W291,W293,W503,W605,E123,E125,E203,E226,E241 - -[testenv:unittest] -basepython = python3 -commands = python3 -m unittest osm_rosdn_juniper_contrail.tests - -[testenv:build] -basepython = python3 -deps = stdeb - setuptools-version-command -commands = python3 setup.py --command-packages=stdeb.command bdist_deb - diff --git a/RO-SDN-odl_openflow/Makefile b/RO-SDN-odl_openflow/Makefile deleted file mode 100644 index d1d3543d..00000000 --- a/RO-SDN-odl_openflow/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -## -# 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. -## - -all: clean package - -clean: - rm -rf dist deb_dist osm_rosdn_odlof-*.tar.gz osm_rosdn_odlof.egg-info .eggs - -package: - python3 setup.py --command-packages=stdeb.command sdist_dsc - cd deb_dist/osm-rosdn-odlof*/ && dpkg-buildpackage -rfakeroot -uc -us - diff --git a/RO-SDN-odl_openflow/osm_rosdn_odlof/__init__.py b/RO-SDN-odl_openflow/osm_rosdn_odlof/__init__.py new file mode 100644 index 00000000..94a6a32d --- /dev/null +++ b/RO-SDN-odl_openflow/osm_rosdn_odlof/__init__.py @@ -0,0 +1,16 @@ +#!/usr/bin/env python3 +# Copyright ETSI Contributors and Others. +# +# 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. +## diff --git a/RO-SDN-odl_openflow/osm_rosdn_odlof/tests/__init__.py b/RO-SDN-odl_openflow/osm_rosdn_odlof/tests/__init__.py new file mode 100644 index 00000000..04f7d49f --- /dev/null +++ b/RO-SDN-odl_openflow/osm_rosdn_odlof/tests/__init__.py @@ -0,0 +1,16 @@ +####################################################################################### +# Copyright ETSI Contributors and Others. +# +# 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. +####################################################################################### diff --git a/RO-SDN-odl_openflow/requirements.in b/RO-SDN-odl_openflow/requirements.in new file mode 100644 index 00000000..25e572e9 --- /dev/null +++ b/RO-SDN-odl_openflow/requirements.in @@ -0,0 +1,17 @@ +# Copyright ETSI Contributors and Others. +# +# 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. +## + +requests diff --git a/RO-SDN-odl_openflow/requirements.txt b/RO-SDN-odl_openflow/requirements.txt deleted file mode 100644 index 37366789..00000000 --- a/RO-SDN-odl_openflow/requirements.txt +++ /dev/null @@ -1,17 +0,0 @@ -## -# 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. -## - -requests -git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin diff --git a/RO-SDN-odl_openflow/setup.py b/RO-SDN-odl_openflow/setup.py index 4d6580a6..50a47c87 100644 --- a/RO-SDN-odl_openflow/setup.py +++ b/RO-SDN-odl_openflow/setup.py @@ -19,8 +19,16 @@ from setuptools import setup _name = "osm_rosdn_odlof" +_version_command = ("git describe --match v* --tags --long --dirty", "pep440-git-full") +_description = "OSM RO plugin for SDN with odl openflow rules" +_author = "OSM Support" +_author_email = "osmsupport@etsi.org" +_maintainer = "OSM Support" +_maintainer_email = "osmsupport@etsi.org" +_license = "Apache 2.0" +_url = "https://osm.etsi.org/gitweb/?p=osm/RO.git;a=summary" -README = """ +_readme = """ =========== osm-rosdn_odlof =========== @@ -30,26 +38,17 @@ osm-ro plugin for OpenDayLight SDN using pre-computed openflow rules setup( name=_name, - description="OSM RO plugin for SDN with odl openflow rules", - long_description=README, - version_command=( - "git describe --match v* --tags --long --dirty", - "pep440-git-full", - ), - # version=VERSION, - # python_requires='>3.5.0', - author="ETSI OSM", - author_email="alfonso.tiernosepulveda@telefonica.com", - maintainer="Alfonso Tierno", - maintainer_email="alfonso.tiernosepulveda@telefonica.com", - url="https://osm.etsi.org/gitweb/?p=osm/RO.git;a=summary", - license="Apache 2.0", + description=_description, + long_description=_readme, + version_command=_version_command, + author=_author, + author_email=_author_email, + maintainer=_maintainer, + maintainer_email=_maintainer_email, + url=_url, + license=_license, packages=[_name], include_package_data=True, - install_requires=[ - "requests", - "osm-ro-plugin @ git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin", - ], setup_requires=["setuptools-version-command"], entry_points={ "osm_rosdn.plugins": [ diff --git a/RO-SDN-odl_openflow/stdeb.cfg b/RO-SDN-odl_openflow/stdeb.cfg index f5f8e839..262a47c8 100644 --- a/RO-SDN-odl_openflow/stdeb.cfg +++ b/RO-SDN-odl_openflow/stdeb.cfg @@ -15,5 +15,3 @@ [DEFAULT] X-Python3-Version : >= 3.5 -Maintainer: Alfonso Tierno -Depends3: python3-requests, python3-osm-ro-plugin diff --git a/RO-SDN-odl_openflow/tox.ini b/RO-SDN-odl_openflow/tox.ini deleted file mode 100644 index 47743ef7..00000000 --- a/RO-SDN-odl_openflow/tox.ini +++ /dev/null @@ -1,43 +0,0 @@ -## -# 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. -## - -[tox] -envlist = flake8 -toxworkdir={toxinidir}/../.tox - -[testenv] -basepython = python3 -install_command = python3 -m pip install -U {opts} {packages} -# deps = -r{toxinidir}/test-requirements.txt -commands=python3 -m unittest discover -v - -[testenv:flake8] -basepython = python3 -deps = flake8 - -r{toxinidir}/requirements.txt -install_command = python3 -m pip install -U {opts} {packages} -commands = flake8 osm_rosdn_odlof --max-line-length 120 \ - --exclude .svn,CVS,.gz,.git,__pycache__,.tox,local,temp --ignore W291,W293,W503,W605,E123,E125,E203,E226,E241 - -[testenv:unittest] -basepython = python3 -commands = python3 -m unittest osm_rosdn_odlof.tests - -[testenv:build] -basepython = python3 -deps = stdeb - setuptools-version-command -commands = python3 setup.py --command-packages=stdeb.command bdist_deb - diff --git a/RO-SDN-onos_openflow/Makefile b/RO-SDN-onos_openflow/Makefile deleted file mode 100644 index 5e96ce0b..00000000 --- a/RO-SDN-onos_openflow/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -## -# 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. -## - -all: clean package - -clean: - rm -rf dist deb_dist osm_rosdn_onosof-*.tar.gz osm_rosdn_onosof.egg-info .eggs - -package: - python3 setup.py --command-packages=stdeb.command sdist_dsc - cd deb_dist/osm-rosdn-onosof*/ && dpkg-buildpackage -rfakeroot -uc -us - diff --git a/RO-SDN-onos_openflow/osm_rosdn_onosof/__init__.py b/RO-SDN-onos_openflow/osm_rosdn_onosof/__init__.py new file mode 100644 index 00000000..94a6a32d --- /dev/null +++ b/RO-SDN-onos_openflow/osm_rosdn_onosof/__init__.py @@ -0,0 +1,16 @@ +#!/usr/bin/env python3 +# Copyright ETSI Contributors and Others. +# +# 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. +## diff --git a/RO-SDN-onos_openflow/osm_rosdn_onosof/tests/__init__.py b/RO-SDN-onos_openflow/osm_rosdn_onosof/tests/__init__.py new file mode 100644 index 00000000..04f7d49f --- /dev/null +++ b/RO-SDN-onos_openflow/osm_rosdn_onosof/tests/__init__.py @@ -0,0 +1,16 @@ +####################################################################################### +# Copyright ETSI Contributors and Others. +# +# 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. +####################################################################################### diff --git a/RO-SDN-onos_openflow/requirements.in b/RO-SDN-onos_openflow/requirements.in new file mode 100644 index 00000000..25e572e9 --- /dev/null +++ b/RO-SDN-onos_openflow/requirements.in @@ -0,0 +1,17 @@ +# Copyright ETSI Contributors and Others. +# +# 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. +## + +requests diff --git a/RO-SDN-onos_openflow/requirements.txt b/RO-SDN-onos_openflow/requirements.txt deleted file mode 100644 index 37366789..00000000 --- a/RO-SDN-onos_openflow/requirements.txt +++ /dev/null @@ -1,17 +0,0 @@ -## -# 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. -## - -requests -git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin diff --git a/RO-SDN-onos_openflow/setup.py b/RO-SDN-onos_openflow/setup.py index 84d9cb7a..ee57cf25 100644 --- a/RO-SDN-onos_openflow/setup.py +++ b/RO-SDN-onos_openflow/setup.py @@ -19,8 +19,16 @@ from setuptools import setup _name = "osm_rosdn_onosof" +_version_command = ("git describe --match v* --tags --long --dirty", "pep440-git-full") +_description = "OSM RO plugin for SDN with onos openflow rules" +_author = "OSM Support" +_author_email = "osmsupport@etsi.org" +_maintainer = "OSM Support" +_maintainer_email = "osmsupport@etsi.org" +_license = "Apache 2.0" +_url = "https://osm.etsi.org/gitweb/?p=osm/RO.git;a=summary" -README = """ +_readme = """ =========== osm-rosdn_onosof =========== @@ -30,26 +38,17 @@ osm-ro plugin for onos SDN using pre-computed openflow rules setup( name=_name, - description="OSM RO plugin for SDN with onos openflow rules", - long_description=README, - version_command=( - "git describe --match v* --tags --long --dirty", - "pep440-git-full", - ), - # version=VERSION, - # python_requires='>3.5.0', - author="ETSI OSM", - author_email="alfonso.tiernosepulveda@telefonica.com", - maintainer="Alfonso Tierno", - maintainer_email="alfonso.tiernosepulveda@telefonica.com", - url="https://osm.etsi.org/gitweb/?p=osm/RO.git;a=summary", - license="Apache 2.0", + description=_description, + long_description=_readme, + version_command=_version_command, + author=_author, + author_email=_author_email, + maintainer=_maintainer, + maintainer_email=_maintainer_email, + url=_url, + license=_license, packages=[_name], include_package_data=True, - install_requires=[ - "requests", - "osm-ro-plugin @ git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin", - ], setup_requires=["setuptools-version-command"], entry_points={ "osm_rosdn.plugins": [ diff --git a/RO-SDN-onos_openflow/stdeb.cfg b/RO-SDN-onos_openflow/stdeb.cfg index f5f8e839..262a47c8 100644 --- a/RO-SDN-onos_openflow/stdeb.cfg +++ b/RO-SDN-onos_openflow/stdeb.cfg @@ -15,5 +15,3 @@ [DEFAULT] X-Python3-Version : >= 3.5 -Maintainer: Alfonso Tierno -Depends3: python3-requests, python3-osm-ro-plugin diff --git a/RO-SDN-onos_openflow/tox.ini b/RO-SDN-onos_openflow/tox.ini deleted file mode 100644 index 0e17031b..00000000 --- a/RO-SDN-onos_openflow/tox.ini +++ /dev/null @@ -1,43 +0,0 @@ -## -# 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. -## - -[tox] -envlist = flake8 -toxworkdir={toxinidir}/../.tox - -[testenv] -basepython = python3 -install_command = python3 -m pip install -U {opts} {packages} -# deps = -r{toxinidir}/test-requirements.txt -commands=python3 -m unittest discover -v - -[testenv:flake8] -basepython = python3 -deps = flake8 - -r{toxinidir}/requirements.txt -install_command = python3 -m pip install -U {opts} {packages} -commands = flake8 osm_rosdn_onosof --max-line-length 120 \ - --exclude .svn,CVS,.gz,.git,__pycache__,.tox,local,temp --ignore W291,W293,W503,W605,E123,E125,E203,E226,E241 - -[testenv:unittest] -basepython = python3 -commands = python3 -m unittest osm_rosdn_onosof.tests - -[testenv:build] -basepython = python3 -deps = stdeb - setuptools-version-command -commands = python3 setup.py --command-packages=stdeb.command bdist_deb - diff --git a/RO-SDN-onos_vpls/Makefile b/RO-SDN-onos_vpls/Makefile deleted file mode 100644 index 952d6ef8..00000000 --- a/RO-SDN-onos_vpls/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -## -# 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. -## - -all: clean package - -clean: - rm -rf dist deb_dist osm_rosdn_onos_vpls-*.tar.gz osm_rosdn_onos_vpls.egg-info .eggs - -package: - python3 setup.py --command-packages=stdeb.command sdist_dsc - cd deb_dist/osm-rosdn-onos-vpls*/ && dpkg-buildpackage -rfakeroot -uc -us - diff --git a/RO-SDN-onos_vpls/osm_rosdn_onos_vpls/__init__.py b/RO-SDN-onos_vpls/osm_rosdn_onos_vpls/__init__.py new file mode 100644 index 00000000..94a6a32d --- /dev/null +++ b/RO-SDN-onos_vpls/osm_rosdn_onos_vpls/__init__.py @@ -0,0 +1,16 @@ +#!/usr/bin/env python3 +# Copyright ETSI Contributors and Others. +# +# 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. +## diff --git a/RO-SDN-onos_vpls/osm_rosdn_onos_vpls/tests/__init__.py b/RO-SDN-onos_vpls/osm_rosdn_onos_vpls/tests/__init__.py new file mode 100644 index 00000000..04f7d49f --- /dev/null +++ b/RO-SDN-onos_vpls/osm_rosdn_onos_vpls/tests/__init__.py @@ -0,0 +1,16 @@ +####################################################################################### +# Copyright ETSI Contributors and Others. +# +# 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. +####################################################################################### diff --git a/RO-SDN-onos_vpls/requirements.in b/RO-SDN-onos_vpls/requirements.in new file mode 100644 index 00000000..25e572e9 --- /dev/null +++ b/RO-SDN-onos_vpls/requirements.in @@ -0,0 +1,17 @@ +# Copyright ETSI Contributors and Others. +# +# 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. +## + +requests diff --git a/RO-SDN-onos_vpls/requirements.txt b/RO-SDN-onos_vpls/requirements.txt deleted file mode 100644 index 37366789..00000000 --- a/RO-SDN-onos_vpls/requirements.txt +++ /dev/null @@ -1,17 +0,0 @@ -## -# 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. -## - -requests -git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin diff --git a/RO-SDN-onos_vpls/setup.py b/RO-SDN-onos_vpls/setup.py index df7f366b..bedbd794 100644 --- a/RO-SDN-onos_vpls/setup.py +++ b/RO-SDN-onos_vpls/setup.py @@ -19,8 +19,16 @@ from setuptools import setup _name = "osm_rosdn_onos_vpls" +_version_command = ("git describe --match v* --tags --long --dirty", "pep440-git-full") +_description = "OSM ro sdn plugin for ONOS VPLS" +_author = "OSM Support" +_author_email = "osmsupport@etsi.org" +_maintainer = "OSM Support" +_maintainer_email = "osmsupport@etsi.org" +_license = "Apache 2.0" +_url = "https://osm.etsi.org/gitweb/?p=osm/RO.git;a=summary" -README = """ +_readme = """ =========== osm-rosdn_onos_vpls =========== @@ -30,26 +38,17 @@ osm-ro pluging for ONOS VPLS SDN setup( name=_name, - description="OSM ro sdn plugin for ONOS VPLS", - long_description=README, - version_command=( - "git describe --match v* --tags --long --dirty", - "pep440-git-full", - ), - # version=VERSION, - # python_requires='>3.5.0', - author="ETSI OSM", - author_email="OSM_TECH@list.etsi.org", - maintainer="ETSI OSM", - maintainer_email="OSM_TECH@list.etsi.org", - url="https://osm.etsi.org/gitweb/?p=osm/RO.git;a=summary", - license="Apache 2.0", + description=_description, + long_description=_readme, + version_command=_version_command, + author=_author, + author_email=_author_email, + maintainer=_maintainer, + maintainer_email=_maintainer_email, + url=_url, + license=_license, packages=[_name], include_package_data=True, - install_requires=[ - "requests", - "osm-ro-plugin @ git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin", - ], setup_requires=["setuptools-version-command"], entry_points={ "osm_rosdn.plugins": [ diff --git a/RO-SDN-onos_vpls/stdeb.cfg b/RO-SDN-onos_vpls/stdeb.cfg index dea4d923..262a47c8 100644 --- a/RO-SDN-onos_vpls/stdeb.cfg +++ b/RO-SDN-onos_vpls/stdeb.cfg @@ -15,5 +15,3 @@ [DEFAULT] X-Python3-Version : >= 3.5 -Depends3: python3-requests, python3-osm-ro-plugin - diff --git a/RO-SDN-onos_vpls/tox.ini b/RO-SDN-onos_vpls/tox.ini deleted file mode 100644 index e0ec3485..00000000 --- a/RO-SDN-onos_vpls/tox.ini +++ /dev/null @@ -1,41 +0,0 @@ -## -# 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. -## - -[tox] -envlist = flake8 -toxworkdir={toxinidir}/../.tox - -[testenv] -basepython = python3 -install_command = python3 -m pip install -r requirements.txt -U {opts} {packages} -# deps = -r{toxinidir}/test-requirements.txt -commands=python3 -m unittest discover -v - -[testenv:flake8] -basepython = python3 -deps = flake8 -commands = flake8 osm_rosdn_onos_vpls --max-line-length 120 \ - --exclude .svn,CVS,.gz,.git,__pycache__,.tox,local,temp --ignore W291,W293,W503,W605,E123,E125,E203,E226,E241 - -[testenv:unittest] -basepython = python3 -commands = python3 -m unittest osm_rosdn_onos_vpls.tests - -[testenv:build] -basepython = python3 -deps = stdeb - setuptools-version-command -commands = python3 setup.py --command-packages=stdeb.command bdist_deb - diff --git a/RO-VIM-aws/Makefile b/RO-VIM-aws/Makefile deleted file mode 100644 index edf3eb7a..00000000 --- a/RO-VIM-aws/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -## -# 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. -## - -all: clean package - -clean: - rm -rf dist deb_dist osm_rovim_aws-*.tar.gz osm_rovim_aws.egg-info .eggs - -package: - python3 setup.py --command-packages=stdeb.command sdist_dsc - cd deb_dist/osm-rovim-aws*/ && dpkg-buildpackage -rfakeroot -uc -us diff --git a/RO-VIM-aws/osm_rovim_aws/__init__.py b/RO-VIM-aws/osm_rovim_aws/__init__.py new file mode 100644 index 00000000..94a6a32d --- /dev/null +++ b/RO-VIM-aws/osm_rovim_aws/__init__.py @@ -0,0 +1,16 @@ +#!/usr/bin/env python3 +# Copyright ETSI Contributors and Others. +# +# 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. +## diff --git a/RO-VIM-aws/osm_rovim_aws/tests/__init__.py b/RO-VIM-aws/osm_rovim_aws/tests/__init__.py new file mode 100644 index 00000000..04f7d49f --- /dev/null +++ b/RO-VIM-aws/osm_rovim_aws/tests/__init__.py @@ -0,0 +1,16 @@ +####################################################################################### +# Copyright ETSI Contributors and Others. +# +# 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. +####################################################################################### diff --git a/RO-VIM-aws/requirements.in b/RO-VIM-aws/requirements.in new file mode 100644 index 00000000..457b9982 --- /dev/null +++ b/RO-VIM-aws/requirements.in @@ -0,0 +1,20 @@ +# Copyright ETSI Contributors and Others. +# +# 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. +## + +PyYAML +requests +netaddr +boto diff --git a/RO-VIM-aws/requirements.txt b/RO-VIM-aws/requirements.txt deleted file mode 100644 index 689089e9..00000000 --- a/RO-VIM-aws/requirements.txt +++ /dev/null @@ -1,20 +0,0 @@ -## -# 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. -## - -PyYAML -requests -netaddr -boto -git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin diff --git a/RO-VIM-aws/setup.py b/RO-VIM-aws/setup.py index ea58fb4d..85c383eb 100644 --- a/RO-VIM-aws/setup.py +++ b/RO-VIM-aws/setup.py @@ -19,40 +19,36 @@ from setuptools import setup _name = "osm_rovim_aws" +_version_command = ("git describe --match v* --tags --long --dirty", "pep440-git-full") +_description = "OSM ro vim plugin for AWS" +_author = "OSM Support" +_author_email = "osmsupport@etsi.org" +_maintainer = "OSM Support" +_maintainer_email = "osmsupport@etsi.org" +_license = "Apache 2.0" +_url = "https://osm.etsi.org/gitweb/?p=osm/RO.git;a=summary" -README = """ +_readme = """ =========== osm-rovim_aws =========== -osm-ro pluging for aws VIM +osm-ro pluging for AWS VIM """ setup( name=_name, - description="OSM ro vim plugin for aws", - long_description=README, - version_command=( - "git describe --match v* --tags --long --dirty", - "pep440-git-full", - ), - # version=VERSION, - # python_requires='>3.5.0', - author="ETSI OSM", - author_email="OSM_TECH@LIST.ETSI.ORG", - maintainer="ETSI OSM", - maintainer_email="OSM_TECH@LIST.ETSI.ORG", - url="https://osm.etsi.org/gitweb/?p=osm/RO.git;a=summary", - license="Apache 2.0", + description=_description, + long_description=_readme, + version_command=_version_command, + author=_author, + author_email=_author_email, + maintainer=_maintainer, + maintainer_email=_maintainer_email, + url=_url, + license=_license, packages=[_name], include_package_data=True, - install_requires=[ - "requests", - "netaddr", - "PyYAML", - "boto", - "osm-ro-plugin @ git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin", - ], setup_requires=["setuptools-version-command"], entry_points={ "osm_rovim.plugins": ["rovim_aws = osm_rovim_aws.vimconn_aws:vimconnector"], diff --git a/RO-VIM-aws/stdeb.cfg b/RO-VIM-aws/stdeb.cfg index eece4e18..262a47c8 100644 --- a/RO-VIM-aws/stdeb.cfg +++ b/RO-VIM-aws/stdeb.cfg @@ -15,4 +15,3 @@ [DEFAULT] X-Python3-Version : >= 3.5 -Depends3: python3-boto, python3-requests, python3-netaddr, python3-yaml, python3-osm-ro-plugin diff --git a/RO-VIM-aws/tox.ini b/RO-VIM-aws/tox.ini deleted file mode 100644 index 5002bbd4..00000000 --- a/RO-VIM-aws/tox.ini +++ /dev/null @@ -1,41 +0,0 @@ -## -# 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. -## - -[tox] -envlist = flake8 -toxworkdir={toxinidir}/../.tox - -[testenv] -basepython = python3 -install_command = python3 -m pip install -r requirements.txt -U {opts} {packages} -# deps = -r{toxinidir}/test-requirements.txt -commands=python3 -m unittest discover -v - -[testenv:flake8] -basepython = python3 -deps = flake8 -commands = flake8 osm_rovim_aws --max-line-length 120 \ - --exclude .svn,CVS,.gz,.git,__pycache__,.tox,local,temp --ignore W291,W293,W503,W605,E123,E125,E203,E226,E241 - -[testenv:unittest] -basepython = python3 -commands = python3 -m unittest osm_rovim_aws.tests - -[testenv:build] -basepython = python3 -deps = stdeb - setuptools-version-command -commands = python3 setup.py --command-packages=stdeb.command bdist_deb - diff --git a/RO-VIM-azure/Makefile b/RO-VIM-azure/Makefile deleted file mode 100644 index d5b779a3..00000000 --- a/RO-VIM-azure/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -## -# 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. -## - -all: clean package - -clean: - rm -rf dist deb_dist osm_rovim_azure-*.tar.gz osm_rovim_azure.egg-info .eggs - -package: - python3 setup.py --command-packages=stdeb.command sdist_dsc - cp debian/python3-osm-rovim-azure.postinst deb_dist/osm-rovim-azure*/debian/ - cd deb_dist/osm-rovim-azure*/ && dpkg-buildpackage -rfakeroot -uc -us - diff --git a/RO-VIM-azure/debian/python3-osm-rovim-azure.postinst b/RO-VIM-azure/debian/python3-osm-rovim-azure.postinst deleted file mode 100755 index 20b0f845..00000000 --- a/RO-VIM-azure/debian/python3-osm-rovim-azure.postinst +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash - -## -# 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. -# -# For those usages not covered by the Apache License, Version 2.0 please -# contact with: OSM_TECH@list.etsi.org -## - -echo "POST INSTALL OSM-ROVIM-AZURE" - -#Pip packages required for azure connector -python3 -m pip install azure==4.0.0 - diff --git a/RO-VIM-azure/osm_rovim_azure/__init__.py b/RO-VIM-azure/osm_rovim_azure/__init__.py new file mode 100644 index 00000000..94a6a32d --- /dev/null +++ b/RO-VIM-azure/osm_rovim_azure/__init__.py @@ -0,0 +1,16 @@ +#!/usr/bin/env python3 +# Copyright ETSI Contributors and Others. +# +# 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. +## diff --git a/RO-VIM-azure/osm_rovim_azure/tests/__init__.py b/RO-VIM-azure/osm_rovim_azure/tests/__init__.py new file mode 100644 index 00000000..04f7d49f --- /dev/null +++ b/RO-VIM-azure/osm_rovim_azure/tests/__init__.py @@ -0,0 +1,16 @@ +####################################################################################### +# Copyright ETSI Contributors and Others. +# +# 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. +####################################################################################### diff --git a/RO-VIM-azure/requirements.in b/RO-VIM-azure/requirements.in new file mode 100644 index 00000000..73db2940 --- /dev/null +++ b/RO-VIM-azure/requirements.in @@ -0,0 +1,20 @@ +# Copyright ETSI Contributors and Others. +# +# 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. +## + +PyYAML +requests +netaddr +azure==4.0.0 diff --git a/RO-VIM-azure/requirements.txt b/RO-VIM-azure/requirements.txt deleted file mode 100644 index 88e2fcae..00000000 --- a/RO-VIM-azure/requirements.txt +++ /dev/null @@ -1,20 +0,0 @@ -## -# 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. -## - -PyYAML -requests -netaddr -azure==4.0.0 -git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin diff --git a/RO-VIM-azure/setup.py b/RO-VIM-azure/setup.py index f6b5ffec..7db91f34 100644 --- a/RO-VIM-azure/setup.py +++ b/RO-VIM-azure/setup.py @@ -19,40 +19,36 @@ from setuptools import setup _name = "osm_rovim_azure" +_version_command = ("git describe --match v* --tags --long --dirty", "pep440-git-full") +_description = "OSM ro vim plugin for Azure" +_author = "OSM Support" +_author_email = "osmsupport@etsi.org" +_maintainer = "OSM Support" +_maintainer_email = "osmsupport@etsi.org" +_license = "Apache 2.0" +_url = "https://osm.etsi.org/gitweb/?p=osm/RO.git;a=summary" -README = """ +_readme = """ =========== osm-rovim_azure =========== -osm-ro pluging for azure VIM +osm-ro pluging for Azure VIM """ setup( name=_name, - description="OSM ro vim plugin for azure", - long_description=README, - version_command=( - "git describe --match v* --tags --long --dirty", - "pep440-git-full", - ), - # version=VERSION, - # python_requires='>3.5.0', - author="ETSI OSM", - author_email="alfonso.tiernosepulveda@telefonica.com", - maintainer="Alfonso Tierno", - maintainer_email="alfonso.tiernosepulveda@telefonica.com", - url="https://osm.etsi.org/gitweb/?p=osm/RO.git;a=summary", - license="Apache 2.0", + description=_description, + long_description=_readme, + version_command=_version_command, + author=_author, + author_email=_author_email, + maintainer=_maintainer, + maintainer_email=_maintainer_email, + url=_url, + license=_license, packages=[_name], include_package_data=True, - install_requires=[ - "requests", - "netaddr", - "PyYAML", - "azure==4.0.0", - "osm-ro-plugin @ git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin", - ], setup_requires=["setuptools-version-command"], entry_points={ "osm_rovim.plugins": [ diff --git a/RO-VIM-azure/stdeb.cfg b/RO-VIM-azure/stdeb.cfg index 04cf304d..262a47c8 100644 --- a/RO-VIM-azure/stdeb.cfg +++ b/RO-VIM-azure/stdeb.cfg @@ -15,5 +15,3 @@ [DEFAULT] X-Python3-Version : >= 3.5 -Depends3: python3-requests, python3-netaddr, python3-yaml, python3-osm-ro-plugin, python3-pip - diff --git a/RO-VIM-azure/tox.ini b/RO-VIM-azure/tox.ini deleted file mode 100644 index 18ba9060..00000000 --- a/RO-VIM-azure/tox.ini +++ /dev/null @@ -1,41 +0,0 @@ -## -# 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. -## - -[tox] -envlist = flake8 -toxworkdir={toxinidir}/../.tox - -[testenv] -basepython = python3 -install_command = python3 -m pip install -r requirements.txt -U {opts} {packages} -# deps = -r{toxinidir}/test-requirements.txt -commands=python3 -m unittest discover -v - -[testenv:flake8] -basepython = python3 -deps = flake8 -commands = flake8 osm_rovim_azure --max-line-length 120 \ - --exclude .svn,CVS,.gz,.git,__pycache__,.tox,local,temp --ignore W291,W293,W503,W605,E123,E125,E203,E226,E241 - -[testenv:unittest] -basepython = python3 -commands = python3 -m unittest osm_rovim_azure.tests - -[testenv:build] -basepython = python3 -deps = stdeb - setuptools-version-command -commands = python3 setup.py --command-packages=stdeb.command bdist_deb - diff --git a/RO-VIM-fos/Makefile b/RO-VIM-fos/Makefile deleted file mode 100644 index 26934532..00000000 --- a/RO-VIM-fos/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -## -# 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. -## - -all: clean package - -clean: - rm -rf dist deb_dist osm_rovim_fos-*.tar.gz osm_rovim_fos.egg-info .eggs - -package: - python3 setup.py --command-packages=stdeb.command sdist_dsc - cp debian/python3-osm-rovim-fos.postinst deb_dist/osm-rovim-fos*/debian/ - cd deb_dist/osm-rovim-fos*/ && dpkg-buildpackage -rfakeroot -uc -us diff --git a/RO-VIM-fos/debian/python3-osm-rovim-fos.postinst b/RO-VIM-fos/debian/python3-osm-rovim-fos.postinst deleted file mode 100755 index b6720a3b..00000000 --- a/RO-VIM-fos/debian/python3-osm-rovim-fos.postinst +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash - -## -# 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. -# -# For those usages not covered by the Apache License, Version 2.0 please -# contact with: OSM_TECH@list.etsi.org -## - -echo "POST INSTALL OSM-ROVIM-FOS" - -#Pip packages required for Eclipse fog05 connector -curl -Lo /tmp/libzenohc.so https://github.com/eclipse-fog05/fog05/releases/download/v0.1.0/libzenohc.so -mv /tmp/libzenohc.so /usr/local/lib/libzenohc.so -python3 -m pip install pyangbind sphinx zenoh==0.3.0 yaks==0.3.0.post1 fog05-sdk==0.2.0 fog05==0.2.0 - diff --git a/RO-VIM-fos/osm_rovim_fos/__init__.py b/RO-VIM-fos/osm_rovim_fos/__init__.py new file mode 100644 index 00000000..94a6a32d --- /dev/null +++ b/RO-VIM-fos/osm_rovim_fos/__init__.py @@ -0,0 +1,16 @@ +#!/usr/bin/env python3 +# Copyright ETSI Contributors and Others. +# +# 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. +## diff --git a/RO-VIM-fos/osm_rovim_fos/tests/__init__.py b/RO-VIM-fos/osm_rovim_fos/tests/__init__.py new file mode 100644 index 00000000..04f7d49f --- /dev/null +++ b/RO-VIM-fos/osm_rovim_fos/tests/__init__.py @@ -0,0 +1,16 @@ +####################################################################################### +# Copyright ETSI Contributors and Others. +# +# 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. +####################################################################################### diff --git a/RO-VIM-fos/requirements.in b/RO-VIM-fos/requirements.in new file mode 100644 index 00000000..f83988f9 --- /dev/null +++ b/RO-VIM-fos/requirements.in @@ -0,0 +1,25 @@ +# Copyright ETSI Contributors and Others. +# +# 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. +## + +PyYAML +requests +netaddr +fog05-sdk==0.2.0 +fog05==0.2.0 +zenoh==0.3.0 +yaks==0.3.0.post1 +pyangbind +sphinx diff --git a/RO-VIM-fos/requirements.txt b/RO-VIM-fos/requirements.txt deleted file mode 100644 index 2bded1b9..00000000 --- a/RO-VIM-fos/requirements.txt +++ /dev/null @@ -1,25 +0,0 @@ -## -# 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. -## - -PyYAML -requests -netaddr -fog05-sdk==0.2.0 -fog05==0.2.0 -zenoh==0.3.0 -yaks==0.3.0.post1 -pyangbind -sphinx -git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin diff --git a/RO-VIM-fos/setup.py b/RO-VIM-fos/setup.py index ef11dca7..2cd2094f 100644 --- a/RO-VIM-fos/setup.py +++ b/RO-VIM-fos/setup.py @@ -19,8 +19,16 @@ from setuptools import setup _name = "osm_rovim_fos" +_version_command = ("git describe --match v* --tags --long --dirty", "pep440-git-full") +_description = "OSM ro vim plugin for Eclipse fog05" +_author = "OSM Support" +_author_email = "osmsupport@etsi.org" +_maintainer = "OSM Support" +_maintainer_email = "osmsupport@etsi.org" +_license = "Apache 2.0" +_url = "https://osm.etsi.org/gitweb/?p=osm/RO.git;a=summary" -README = """ +_readme = """ =========== osm-rovim_fos =========== @@ -30,34 +38,17 @@ osm-ro pluging for Eclipse fog05 VIM setup( name=_name, - description="OSM ro vim plugin for Eclipse fog05", - long_description=README, - version_command=( - "git describe --match v* --tags --long --dirty", - "pep440-git-full", - ), - # version=VERSION, - # python_requires=">3.5.0", - author="ETSI OSM", - author_email="OSM_TECH@LIST.ETSI.ORG", - maintainer="ETSI OSM", - maintainer_email="OSM_TECH@LIST.ETSI.ORG", - url="https://osm.etsi.org/gitweb/?p=osm/RO.git;a=summary", - license="Apache 2.0", + description=_description, + long_description=_readme, + version_command=_version_command, + author=_author, + author_email=_author_email, + maintainer=_maintainer, + maintainer_email=_maintainer_email, + url=_url, + license=_license, packages=[_name], include_package_data=True, - install_requires=[ - "requests", - "netaddr", - "PyYAML", - "zenoh==0.3.0", - "yaks==0.3.0.post1", - "fog05-sdk==0.2.0", - "fog05==0.2.0", - "pyangbind", - "sphinx", - "osm-ro-plugin @ git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin", - ], setup_requires=["setuptools-version-command"], entry_points={ "osm_rovim.plugins": ["rovim_fos = osm_rovim_fos.vimconn_fos:vimconnector"], diff --git a/RO-VIM-fos/stdeb.cfg b/RO-VIM-fos/stdeb.cfg index bea34ad0..262a47c8 100644 --- a/RO-VIM-fos/stdeb.cfg +++ b/RO-VIM-fos/stdeb.cfg @@ -15,4 +15,3 @@ [DEFAULT] X-Python3-Version : >= 3.5 -Depends3: python3-pip, python3-requests, python3-netaddr, python3-yaml, python3-osm-ro-plugin diff --git a/RO-VIM-fos/tox.ini b/RO-VIM-fos/tox.ini deleted file mode 100644 index 836a2934..00000000 --- a/RO-VIM-fos/tox.ini +++ /dev/null @@ -1,41 +0,0 @@ -## -# 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. -## - -[tox] -envlist = flake8 -toxworkdir={toxinidir}/../.tox - -[testenv] -basepython = python3 -install_command = python3 -m pip install -r requirements.txt -U {opts} {packages} -# deps = -r{toxinidir}/test-requirements.txt -commands=python3 -m unittest discover -v - -[testenv:flake8] -basepython = python3 -deps = flake8 -commands = flake8 osm_rovim_fos --max-line-length 120 \ - --exclude .svn,CVS,.gz,.git,__pycache__,.tox,local,temp --ignore W291,W293,W503,W605,E123,E125,E203,E226,E241 - -[testenv:unittest] -basepython = python3 -commands = python3 -m unittest osm_rovim_fos.tests - -[testenv:build] -basepython = python3 -deps = stdeb - setuptools-version-command -commands = python3 setup.py --command-packages=stdeb.command bdist_deb - diff --git a/RO-VIM-opennebula/Makefile b/RO-VIM-opennebula/Makefile deleted file mode 100644 index 2ec6a44d..00000000 --- a/RO-VIM-opennebula/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -## -# Copyright 2017 Telefonica Digital Spain S.L.U. -# 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. -## - -all: clean package - -clean: - rm -rf dist deb_dist osm_rovim_opennebula-*.tar.gz osm_rovim_opennebula.egg-info .eggs - -package: - python3 setup.py --command-packages=stdeb.command sdist_dsc - cp debian/python3-osm-rovim-opennebula.postinst deb_dist/osm-rovim-opennebula*/debian/ - cd deb_dist/osm-rovim-opennebula*/ && dpkg-buildpackage -rfakeroot -uc -us - diff --git a/RO-VIM-opennebula/debian/python3-osm-rovim-opennebula.postinst b/RO-VIM-opennebula/debian/python3-osm-rovim-opennebula.postinst deleted file mode 100755 index cd155167..00000000 --- a/RO-VIM-opennebula/debian/python3-osm-rovim-opennebula.postinst +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash - -## -# 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. -# -# For those usages not covered by the Apache License, Version 2.0 please -# contact with: OSM_TECH@list.etsi.org -## - -echo "POST INSTALL OSM-ROVIM-OPENNEBULA" - -#Pip packages required for opennebula connector -python3 -m pip install -e git+https://github.com/python-oca/python-oca#egg=oca -# python3 -m pip install untangle -python3 -m pip install pyone - diff --git a/RO-VIM-opennebula/osm_rovim_opennebula/__init__.py b/RO-VIM-opennebula/osm_rovim_opennebula/__init__.py new file mode 100644 index 00000000..94a6a32d --- /dev/null +++ b/RO-VIM-opennebula/osm_rovim_opennebula/__init__.py @@ -0,0 +1,16 @@ +#!/usr/bin/env python3 +# Copyright ETSI Contributors and Others. +# +# 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. +## diff --git a/RO-VIM-opennebula/osm_rovim_opennebula/tests/__init__.py b/RO-VIM-opennebula/osm_rovim_opennebula/tests/__init__.py new file mode 100644 index 00000000..04f7d49f --- /dev/null +++ b/RO-VIM-opennebula/osm_rovim_opennebula/tests/__init__.py @@ -0,0 +1,16 @@ +####################################################################################### +# Copyright ETSI Contributors and Others. +# +# 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. +####################################################################################### diff --git a/RO-VIM-opennebula/requirements.in b/RO-VIM-opennebula/requirements.in new file mode 100644 index 00000000..ed246528 --- /dev/null +++ b/RO-VIM-opennebula/requirements.in @@ -0,0 +1,22 @@ +# Copyright ETSI Contributors and Others. +# +# 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. +## + +PyYAML +requests +netaddr +# untangle +pyone +oca diff --git a/RO-VIM-opennebula/requirements.txt b/RO-VIM-opennebula/requirements.txt deleted file mode 100644 index 6db93ce9..00000000 --- a/RO-VIM-opennebula/requirements.txt +++ /dev/null @@ -1,23 +0,0 @@ -## -# Copyright 2017 Telefonica Digital Spain S.L.U. -# 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. -## - -PyYAML -requests -netaddr -# untangle -pyone -git+https://github.com/python-oca/python-oca#egg=oca -git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin diff --git a/RO-VIM-opennebula/setup.py b/RO-VIM-opennebula/setup.py index 29fd37c2..8c574f0c 100644 --- a/RO-VIM-opennebula/setup.py +++ b/RO-VIM-opennebula/setup.py @@ -20,8 +20,16 @@ from setuptools import setup _name = "osm_rovim_opennebula" +_version_command = ("git describe --match v* --tags --long --dirty", "pep440-git-full") +_description = "OSM ro vim plugin for opennebula" +_author = "OSM Support" +_author_email = "osmsupport@etsi.org" +_maintainer = "OSM Support" +_maintainer_email = "osmsupport@etsi.org" +_license = "Apache 2.0" +_url = "https://osm.etsi.org/gitweb/?p=osm/RO.git;a=summary" -README = """ +_readme = """ =========== osm-rovim_opennebula =========== @@ -31,28 +39,17 @@ osm-ro pluging for opennebula VIM setup( name=_name, - description="OSM ro vim plugin for opennebula", - long_description=README, - version_command=( - "git describe --match v* --tags --long --dirty", - "pep440-git-full", - ), - # version=VERSION, - # python_requires=">3.5.0", - author="ETSI OSM", - author_email="OSM_TECH@LIST.ETSI.ORG", - maintainer="ETSI OSM", - maintainer_email="OSM_TECH@LIST.ETSI.ORG", - url="https://osm.etsi.org/gitweb/?p=osm/RO.git;a=summary", - license="Apache 2.0", + description=_description, + long_description=_readme, + version_command=_version_command, + author=_author, + author_email=_author_email, + maintainer=_maintainer, + maintainer_email=_maintainer_email, + url=_url, + license=_license, packages=[_name], include_package_data=True, - install_requires=[ - "requests", - "netaddr", - "PyYAML", - "osm-ro-plugin @ git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin", - ], setup_requires=["setuptools-version-command"], entry_points={ "osm_rovim.plugins": [ diff --git a/RO-VIM-opennebula/stdeb.cfg b/RO-VIM-opennebula/stdeb.cfg index 5392c30a..a357416e 100644 --- a/RO-VIM-opennebula/stdeb.cfg +++ b/RO-VIM-opennebula/stdeb.cfg @@ -16,5 +16,3 @@ [DEFAULT] X-Python3-Version : >= 3.5 -Depends3: python3-requests, python3-netaddr, python3-yaml, python3-osm-ro-plugin, python3-pip - diff --git a/RO-VIM-opennebula/tox.ini b/RO-VIM-opennebula/tox.ini deleted file mode 100644 index 874eaa08..00000000 --- a/RO-VIM-opennebula/tox.ini +++ /dev/null @@ -1,42 +0,0 @@ -## -# Copyright 2017 Telefonica Digital Spain S.L.U. -# 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. -## - -[tox] -envlist = flake8 -toxworkdir={toxinidir}/../.tox - -[testenv] -basepython = python3 -install_command = python3 -m pip install -r requirements.txt -U {opts} {packages} -# deps = -r{toxinidir}/test-requirements.txt -commands=python3 -m unittest discover -v - -[testenv:flake8] -basepython = python3 -deps = flake8 -commands = flake8 osm_rovim_opennebula --max-line-length 120 \ - --exclude .svn,CVS,.gz,.git,__pycache__,.tox,local,temp --ignore W291,W293,W503,W605,E123,E125,E203,E226,E241 - -[testenv:unittest] -basepython = python3 -commands = python3 -m unittest osm_rovim_opennebula.tests - -[testenv:build] -basepython = python3 -deps = stdeb - setuptools-version-command -commands = python3 setup.py --command-packages=stdeb.command bdist_deb - diff --git a/RO-VIM-openstack/Makefile b/RO-VIM-openstack/Makefile deleted file mode 100644 index dfafea33..00000000 --- a/RO-VIM-openstack/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -## -# 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. -## - -all: clean package - -clean: - rm -rf dist deb_dist osm_rovim_openstack-*.tar.gz osm_rovim_openstack.egg-info .eggs - -package: - python3 setup.py --command-packages=stdeb.command sdist_dsc - cp debian/python3-osm-rovim-openstack.postinst deb_dist/osm-rovim-openstack*/debian/ - cd deb_dist/osm-rovim-openstack*/ && dpkg-buildpackage -rfakeroot -uc -us - diff --git a/RO-VIM-openstack/debian/python3-osm-rovim-openstack.postinst b/RO-VIM-openstack/debian/python3-osm-rovim-openstack.postinst deleted file mode 100755 index 055d4a5e..00000000 --- a/RO-VIM-openstack/debian/python3-osm-rovim-openstack.postinst +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash - -## -# 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. -# -# For those usages not covered by the Apache License, Version 2.0 please -# contact with: OSM_TECH@list.etsi.org -## - -echo "POST INSTALL OSM-ROVIM-OPENSTACK" - -#Pip packages required for openstack connector -python3 -m pip install networking-l2gw diff --git a/RO-VIM-openstack/osm_rovim_openstack/__init__.py b/RO-VIM-openstack/osm_rovim_openstack/__init__.py new file mode 100644 index 00000000..94a6a32d --- /dev/null +++ b/RO-VIM-openstack/osm_rovim_openstack/__init__.py @@ -0,0 +1,16 @@ +#!/usr/bin/env python3 +# Copyright ETSI Contributors and Others. +# +# 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. +## diff --git a/RO-VIM-openstack/osm_rovim_openstack/tests/__init__.py b/RO-VIM-openstack/osm_rovim_openstack/tests/__init__.py new file mode 100644 index 00000000..04f7d49f --- /dev/null +++ b/RO-VIM-openstack/osm_rovim_openstack/tests/__init__.py @@ -0,0 +1,16 @@ +####################################################################################### +# Copyright ETSI Contributors and Others. +# +# 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. +####################################################################################### diff --git a/RO-VIM-openstack/requirements.in b/RO-VIM-openstack/requirements.in new file mode 100644 index 00000000..0fee2ae0 --- /dev/null +++ b/RO-VIM-openstack/requirements.in @@ -0,0 +1,26 @@ +# Copyright ETSI Contributors and Others. +# +# 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. +## + +PyYAML +python-openstackclient +python-neutronclient +requests +netaddr +networking-l2gw +python-novaclient +python-keystoneclient +python-glanceclient +python-cinderclient diff --git a/RO-VIM-openstack/requirements.txt b/RO-VIM-openstack/requirements.txt deleted file mode 100644 index 2a4b69e7..00000000 --- a/RO-VIM-openstack/requirements.txt +++ /dev/null @@ -1,26 +0,0 @@ -## -# 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. -## - -PyYAML -python-openstackclient -python-neutronclient -requests -netaddr -#TODO py3 networking-l2gw -#TODO py3 python-novaclient -#TODO py3 python-keystoneclient -#TODO py3 python-glanceclient -#TODO py3 python-cinderclient -git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin diff --git a/RO-VIM-openstack/setup.py b/RO-VIM-openstack/setup.py index cc88dbd7..ae163bf1 100644 --- a/RO-VIM-openstack/setup.py +++ b/RO-VIM-openstack/setup.py @@ -19,8 +19,16 @@ from setuptools import setup _name = "osm_rovim_openstack" +_version_command = ("git describe --match v* --tags --long --dirty", "pep440-git-full") +_description = "OSM ro vim plugin for openstack" +_author = "OSM Support" +_author_email = "osmsupport@etsi.org" +_maintainer = "OSM Support" +_maintainer_email = "osmsupport@etsi.org" +_license = "Apache 2.0" +_url = "https://osm.etsi.org/gitweb/?p=osm/RO.git;a=summary" -README = """ +_readme = """ =========== osm-rovim_openstack =========== @@ -30,32 +38,17 @@ osm-ro pluging for openstack VIM setup( name=_name, - description="OSM ro vim plugin for openstack", - long_description=README, - version_command=( - "git describe --match v* --tags --long --dirty", - "pep440-git-full", - ), - # version=VERSION, - # python_requires=">3.5.0", - author="ETSI OSM", - author_email="alfonso.tiernosepulveda@telefonica.com", - maintainer="Alfonso Tierno", - maintainer_email="alfonso.tiernosepulveda@telefonica.com", - url="https://osm.etsi.org/gitweb/?p=osm/RO.git;a=summary", - license="Apache 2.0", + description=_description, + long_description=_readme, + version_command=_version_command, + author=_author, + author_email=_author_email, + maintainer=_maintainer, + maintainer_email=_maintainer_email, + url=_url, + license=_license, packages=[_name], include_package_data=True, - install_requires=[ - "python-openstackclient", - "python-neutronclient", - "requests", - "netaddr", - "PyYAML", - "osm-ro-plugin @ git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin", - # TODO py3 "networking-l2gw" - # "python-novaclient", "python-keystoneclient", "python-glanceclient", "python-cinderclient", - ], setup_requires=["setuptools-version-command"], entry_points={ "osm_rovim.plugins": [ diff --git a/RO-VIM-openstack/stdeb.cfg b/RO-VIM-openstack/stdeb.cfg index a0adf969..262a47c8 100644 --- a/RO-VIM-openstack/stdeb.cfg +++ b/RO-VIM-openstack/stdeb.cfg @@ -15,7 +15,3 @@ [DEFAULT] X-Python3-Version : >= 3.5 -Maintainer: Alfonso Tierno -Depends3: python3-openstackclient, python3-neutronclient, python3-requests, python3-netaddr, python3-yaml, - python3-osm-ro-plugin, python3-pip - # TODO py3 python3-networking-l2gw diff --git a/RO-VIM-openstack/tox.ini b/RO-VIM-openstack/tox.ini deleted file mode 100644 index a2bde738..00000000 --- a/RO-VIM-openstack/tox.ini +++ /dev/null @@ -1,41 +0,0 @@ -## -# 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. -## - -[tox] -envlist = flake8 -toxworkdir={toxinidir}/../.tox - -[testenv] -basepython = python3 -install_command = python3 -m pip install -r requirements.txt -U {opts} {packages} -# deps = -r{toxinidir}/test-requirements.txt -commands=python3 -m unittest discover -v - -[testenv:flake8] -basepython = python3 -deps = flake8 -commands = flake8 osm_rovim_openstack --max-line-length 120 \ - --exclude .svn,CVS,.gz,.git,__pycache__,.tox,local,temp --ignore W291,W293,W503,W605,E123,E125,E203,E226,E241 - -[testenv:unittest] -basepython = python3 -commands = python3 -m unittest osm_rovim_openstack.tests - -[testenv:build] -basepython = python3 -deps = stdeb - setuptools-version-command -commands = python3 setup.py --command-packages=stdeb.command bdist_deb - diff --git a/RO-VIM-openvim/Makefile b/RO-VIM-openvim/Makefile deleted file mode 100644 index 8c688321..00000000 --- a/RO-VIM-openvim/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -## -# 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. -## - -all: clean package - -clean: - rm -rf dist deb_dist osm_rovim_openvim-*.tar.gz osm_rovim_openvim.egg-info .eggs - -package: - python3 setup.py --command-packages=stdeb.command sdist_dsc - cd deb_dist/osm-rovim-openvim*/ && dpkg-buildpackage -rfakeroot -uc -us - diff --git a/RO-VIM-openvim/osm_rovim_openvim/__init__.py b/RO-VIM-openvim/osm_rovim_openvim/__init__.py new file mode 100644 index 00000000..94a6a32d --- /dev/null +++ b/RO-VIM-openvim/osm_rovim_openvim/__init__.py @@ -0,0 +1,16 @@ +#!/usr/bin/env python3 +# Copyright ETSI Contributors and Others. +# +# 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. +## diff --git a/RO-VIM-openvim/osm_rovim_openvim/tests/__init__.py b/RO-VIM-openvim/osm_rovim_openvim/tests/__init__.py new file mode 100644 index 00000000..04f7d49f --- /dev/null +++ b/RO-VIM-openvim/osm_rovim_openvim/tests/__init__.py @@ -0,0 +1,16 @@ +####################################################################################### +# Copyright ETSI Contributors and Others. +# +# 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. +####################################################################################### diff --git a/RO-VIM-openvim/requirements.in b/RO-VIM-openvim/requirements.in new file mode 100644 index 00000000..610aa9a6 --- /dev/null +++ b/RO-VIM-openvim/requirements.in @@ -0,0 +1,19 @@ +# Copyright ETSI Contributors and Others. +# +# 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. +## + +PyYAML +requests +netaddr diff --git a/RO-VIM-openvim/requirements.txt b/RO-VIM-openvim/requirements.txt deleted file mode 100644 index 5802df5b..00000000 --- a/RO-VIM-openvim/requirements.txt +++ /dev/null @@ -1,19 +0,0 @@ -## -# 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. -## - -PyYAML -requests -netaddr -git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin diff --git a/RO-VIM-openvim/setup.py b/RO-VIM-openvim/setup.py index 6cc44477..5332aa27 100644 --- a/RO-VIM-openvim/setup.py +++ b/RO-VIM-openvim/setup.py @@ -19,8 +19,16 @@ from setuptools import setup _name = "osm_rovim_openvim" +_version_command = ("git describe --match v* --tags --long --dirty", "pep440-git-full") +_description = "OSM ro vim plugin for openvim" +_author = "OSM Support" +_author_email = "osmsupport@etsi.org" +_maintainer = "OSM Support" +_maintainer_email = "osmsupport@etsi.org" +_license = "Apache 2.0" +_url = "https://osm.etsi.org/gitweb/?p=osm/RO.git;a=summary" -README = """ +_readme = """ =========== osm-rovim_openvim =========== @@ -30,28 +38,17 @@ osm-ro pluging for openvim VIM setup( name=_name, - description="OSM ro vim plugin for openvim", - long_description=README, - version_command=( - "git describe --match v* --tags --long --dirty", - "pep440-git-full", - ), - # version=VERSION, - # python_requires='>3.5.0', - author="ETSI OSM", - author_email="alfonso.tiernosepulveda@telefonica.com", - maintainer="Alfonso Tierno", - maintainer_email="alfonso.tiernosepulveda@telefonica.com", - url="https://osm.etsi.org/gitweb/?p=osm/RO.git;a=summary", - license="Apache 2.0", + description=_description, + long_description=_readme, + version_command=_version_command, + author=_author, + author_email=_author_email, + maintainer=_maintainer, + maintainer_email=_maintainer_email, + url=_url, + license=_license, packages=[_name], include_package_data=True, - install_requires=[ - "requests", - "netaddr", - "PyYAML", - "osm-ro-plugin @ git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin", - ], setup_requires=["setuptools-version-command"], entry_points={ "osm_rovim.plugins": [ diff --git a/RO-VIM-openvim/stdeb.cfg b/RO-VIM-openvim/stdeb.cfg index b5efb973..262a47c8 100644 --- a/RO-VIM-openvim/stdeb.cfg +++ b/RO-VIM-openvim/stdeb.cfg @@ -15,5 +15,3 @@ [DEFAULT] X-Python3-Version : >= 3.5 -Maintainer: Alfonso Tierno -Depends3: python3-requests, python3-netaddr, python3-yaml, python3-osm-ro-plugin diff --git a/RO-VIM-openvim/tox.ini b/RO-VIM-openvim/tox.ini deleted file mode 100644 index c26f778c..00000000 --- a/RO-VIM-openvim/tox.ini +++ /dev/null @@ -1,41 +0,0 @@ -## -# 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. -## - -[tox] -envlist = flake8 -toxworkdir={toxinidir}/../.tox - -[testenv] -basepython = python3 -install_command = python3 -m pip install -r requirements.txt -U {opts} {packages} -# deps = -r{toxinidir}/test-requirements.txt -commands=python3 -m unittest discover -v - -[testenv:flake8] -basepython = python3 -deps = flake8 -commands = flake8 osm_rovim_openvim --max-line-length 120 \ - --exclude .svn,CVS,.gz,.git,__pycache__,.tox,local,temp --ignore W291,W293,W503,W605,E123,E125,E203,E226,E241 - -[testenv:unittest] -basepython = python3 -commands = python3 -m unittest osm_rovim_openvim.tests - -[testenv:build] -basepython = python3 -deps = stdeb - setuptools-version-command -commands = python3 setup.py --command-packages=stdeb.command bdist_deb - diff --git a/RO-VIM-vmware/Makefile b/RO-VIM-vmware/Makefile deleted file mode 100644 index 283afdfb..00000000 --- a/RO-VIM-vmware/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -## -# Copyright VMware Inc. -# 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. -## - -all: clean package - -clean: - rm -rf dist deb_dist osm_rovim_vmware-*.tar.gz osm_rovim_vmware.egg-info .eggs - -package: - python3 setup.py --command-packages=stdeb.command sdist_dsc - cp debian/python3-osm-rovim-vmware.postinst deb_dist/osm-rovim-vmware*/debian/ - cd deb_dist/osm-rovim-vmware*/ && dpkg-buildpackage -rfakeroot -uc -us - diff --git a/RO-VIM-vmware/debian/python3-osm-rovim-vmware.postinst b/RO-VIM-vmware/debian/python3-osm-rovim-vmware.postinst deleted file mode 100755 index e7ce877e..00000000 --- a/RO-VIM-vmware/debian/python3-osm-rovim-vmware.postinst +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash - -## -# Copyright VMware Inc. -# 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. -# -# For those usages not covered by the Apache License, Version 2.0 please -# contact with: OSM_TECH@list.etsi.org -## - -echo "POST INSTALL OSM-ROVIM-VMWARE" - -#Pip packages required for vmware connector -python3 -m pip install --upgrade pip -python3 -m pip install --upgrade pyvcloud==19.1.1 -python3 -m pip install --upgrade progressbar -python3 -m pip install --upgrade pyvmomi -# python3 -m pip install --upgrade prettytable -# python3 -m pip install --upgrade pyang pyangbind diff --git a/RO-VIM-vmware/osm_rovim_vmware/__init__.py b/RO-VIM-vmware/osm_rovim_vmware/__init__.py new file mode 100644 index 00000000..94a6a32d --- /dev/null +++ b/RO-VIM-vmware/osm_rovim_vmware/__init__.py @@ -0,0 +1,16 @@ +#!/usr/bin/env python3 +# Copyright ETSI Contributors and Others. +# +# 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. +## diff --git a/RO-VIM-vmware/osm_rovim_vmware/tests/__init__.py b/RO-VIM-vmware/osm_rovim_vmware/tests/__init__.py new file mode 100644 index 00000000..04f7d49f --- /dev/null +++ b/RO-VIM-vmware/osm_rovim_vmware/tests/__init__.py @@ -0,0 +1,16 @@ +####################################################################################### +# Copyright ETSI Contributors and Others. +# +# 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. +####################################################################################### diff --git a/RO-VIM-vmware/osm_rovim_vmware/tests/test_vimconn_vmware.py b/RO-VIM-vmware/osm_rovim_vmware/tests/test_vimconn_vmware.py index 467531a9..77f4808e 100755 --- a/RO-VIM-vmware/osm_rovim_vmware/tests/test_vimconn_vmware.py +++ b/RO-VIM-vmware/osm_rovim_vmware/tests/test_vimconn_vmware.py @@ -36,7 +36,7 @@ from pyvcloud.vcd.vapp import VApp import os import unittest from unittest import mock -import test_vimconn_vmware_xml_response as xml_resp +import tests.test_vimconn_vmware_xml_response as xml_resp from os import path __author__ = "Prakash Kasar" diff --git a/RO-VIM-vmware/requirements.in b/RO-VIM-vmware/requirements.in new file mode 100644 index 00000000..160d07d6 --- /dev/null +++ b/RO-VIM-vmware/requirements.in @@ -0,0 +1,24 @@ +# Copyright ETSI Contributors and Others. +# +# 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. +## + +PyYAML +requests +netaddr +pyvcloud==19.1.1 +pyvmomi +progressbar +prettytable +# TODO py3 genisoimage diff --git a/RO-VIM-vmware/requirements.txt b/RO-VIM-vmware/requirements.txt deleted file mode 100644 index 16573675..00000000 --- a/RO-VIM-vmware/requirements.txt +++ /dev/null @@ -1,25 +0,0 @@ -## -# Copyright VMware Inc. -# 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. -## - -PyYAML -requests -netaddr -pyvcloud==19.1.1 -pyvmomi -progressbar -prettytable -# TODO py3 genisoimage -git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin diff --git a/RO-VIM-vmware/setup.py b/RO-VIM-vmware/setup.py index 10f34de6..f60085d0 100644 --- a/RO-VIM-vmware/setup.py +++ b/RO-VIM-vmware/setup.py @@ -20,8 +20,16 @@ from setuptools import setup _name = "osm_rovim_vmware" +_version_command = ("git describe --match v* --tags --long --dirty", "pep440-git-full") +_description = "OSM ro vim plugin for vmware" +_author = "OSM Support" +_author_email = "osmsupport@etsi.org" +_maintainer = "OSM Support" +_maintainer_email = "osmsupport@etsi.org" +_license = "Apache 2.0" +_url = "https://osm.etsi.org/gitweb/?p=osm/RO.git;a=summary" -README = """ +_readme = """ =========== osm-rovim_vmware =========== @@ -31,32 +39,17 @@ osm-ro pluging for vmware VIM setup( name=_name, - description="OSM ro vim plugin for vmware", - long_description=README, - version_command=( - "git describe --match v* --tags --long --dirty", - "pep440-git-full", - ), - # version=VERSION, - # python_requires='>3.5.0', - author="ETSI OSM", - author_email="OSM_TECH@LIST.ETSI.ORG", - maintainer="ETSI OSM", - maintainer_email="OSM_TECH@LIST.ETSI.ORG", - url="https://osm.etsi.org/gitweb/?p=osm/RO.git;a=summary", - license="Apache 2.0", + description=_description, + long_description=_readme, + version_command=_version_command, + author=_author, + author_email=_author_email, + maintainer=_maintainer, + maintainer_email=_maintainer_email, + url=_url, + license=_license, packages=[_name], include_package_data=True, - install_requires=[ - "pyvcloud==19.1.1", - "progressbar", - "prettytable", - "pyvmomi", - "requests", - "netaddr", - "PyYAML", - "osm-ro-plugin @ git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin", - ], setup_requires=["setuptools-version-command"], entry_points={ "osm_rovim.plugins": [ diff --git a/RO-VIM-vmware/stdeb.cfg b/RO-VIM-vmware/stdeb.cfg index 58ac4b91..53cde313 100644 --- a/RO-VIM-vmware/stdeb.cfg +++ b/RO-VIM-vmware/stdeb.cfg @@ -16,5 +16,4 @@ [DEFAULT] X-Python3-Version : >= 3.5 -Depends3: python3-requests, python3-netaddr, python3-yaml, python3-osm-ro-plugin, python3-pip, - genisoimage, python3-progressbar, python3-prettytable, python3-pyvmomi +Depends3: genisoimage diff --git a/RO-VIM-vmware/tox.ini b/RO-VIM-vmware/tox.ini deleted file mode 100644 index 038d140c..00000000 --- a/RO-VIM-vmware/tox.ini +++ /dev/null @@ -1,42 +0,0 @@ -## -# Copyright VMware Inc. -# 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. -## - -[tox] -envlist = flake8 -toxworkdir={toxinidir}/../.tox - -[testenv] -basepython = python3 -install_command = python3 -m pip install -r requirements.txt -U {opts} {packages} -# deps = -r{toxinidir}/test-requirements.txt -commands=python3 -m unittest discover -v - -[testenv:flake8] -basepython = python3 -deps = flake8 -commands = flake8 osm_rovim_vmware --max-line-length 120 \ - --exclude .svn,CVS,.gz,.git,__pycache__,.tox,local,temp --ignore W291,W293,W503,W605,E123,E125,E203,E226,E241 - -[testenv:unittest] -basepython = python3 -commands = python3 -m unittest discover -v osm_rovim_vmware/tests - -[testenv:build] -basepython = python3 -deps = stdeb - setuptools-version-command -commands = python3 setup.py --command-packages=stdeb.command bdist_deb - diff --git a/RO-plugin/Makefile b/RO-plugin/Makefile deleted file mode 100644 index 3522b729..00000000 --- a/RO-plugin/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -## -# 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. -## - -all: clean package - -clean: - rm -rf dist deb_dist osm_ro_plugin-*.tar.gz osm_ro_plugin.egg-info .eggs - -package: - python3 setup.py --command-packages=stdeb.command sdist_dsc - cd deb_dist/osm-ro-plugin*/ && dpkg-buildpackage -rfakeroot -uc -us - diff --git a/RO-plugin/osm_ro_plugin/__init__.py b/RO-plugin/osm_ro_plugin/__init__.py new file mode 100644 index 00000000..94a6a32d --- /dev/null +++ b/RO-plugin/osm_ro_plugin/__init__.py @@ -0,0 +1,16 @@ +#!/usr/bin/env python3 +# Copyright ETSI Contributors and Others. +# +# 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. +## diff --git a/RO-plugin/osm_ro_plugin/tests/__init__.py b/RO-plugin/osm_ro_plugin/tests/__init__.py new file mode 100644 index 00000000..04f7d49f --- /dev/null +++ b/RO-plugin/osm_ro_plugin/tests/__init__.py @@ -0,0 +1,16 @@ +####################################################################################### +# Copyright ETSI Contributors and Others. +# +# 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. +####################################################################################### diff --git a/RO-plugin/requirements.in b/RO-plugin/requirements.in new file mode 100644 index 00000000..7842ca92 --- /dev/null +++ b/RO-plugin/requirements.in @@ -0,0 +1,19 @@ +# Copyright ETSI Contributors and Others. +# +# 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. +## + +PyYAML +paramiko +requests diff --git a/RO-plugin/requirements.txt b/RO-plugin/requirements.txt deleted file mode 100644 index 64c65b4a..00000000 --- a/RO-plugin/requirements.txt +++ /dev/null @@ -1,18 +0,0 @@ -## -# 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. -## - -PyYAML -paramiko -requests diff --git a/RO-plugin/setup.py b/RO-plugin/setup.py index 09c921ea..6a6ce390 100644 --- a/RO-plugin/setup.py +++ b/RO-plugin/setup.py @@ -19,8 +19,16 @@ from setuptools import setup _name = "osm_ro_plugin" +_version_command = ("git describe --match v* --tags --long --dirty", "pep440-git-full") +_description = "OSM ro base class for vim and SDN plugins" +_author = "OSM Support" +_author_email = "osmsupport@etsi.org" +_maintainer = "OSM Support" +_maintainer_email = "osmsupport@etsi.org" +_license = "Apache 2.0" +_url = "https://osm.etsi.org/gitweb/?p=osm/RO.git;a=summary" -README = """ +_readme = """ =========== osm-ro_plugin =========== @@ -30,26 +38,21 @@ osm-ro plugin is the base class for RO VIM and SDN plugins setup( name=_name, - description="OSM ro base class for vim and SDN plugins", - long_description=README, - version_command=( - "git describe --match v* --tags --long --dirty", - "pep440-git-full", - ), - # version=VERSION, - # python_requires='>3.5.0', - author="ETSI OSM", - author_email="alfonso.tiernosepulveda@telefonica.com", - maintainer="Alfonso Tierno", - maintainer_email="alfonso.tiernosepulveda@telefonica.com", - url="https://osm.etsi.org/gitweb/?p=osm/RO.git;a=summary", - license="Apache 2.0", + description=_description, + long_description=_readme, + version_command=_version_command, + author=_author, + author_email=_author_email, + maintainer=_maintainer, + maintainer_email=_maintainer_email, + url=_url, + license=_license, packages=[_name], include_package_data=True, install_requires=[ - "requests", - "paramiko", - "PyYAML", + # "requests", + # "paramiko", + # "PyYAML", ], setup_requires=["setuptools-version-command"], entry_points={ diff --git a/RO-plugin/stdeb.cfg b/RO-plugin/stdeb.cfg index f6f532ee..262a47c8 100644 --- a/RO-plugin/stdeb.cfg +++ b/RO-plugin/stdeb.cfg @@ -15,6 +15,3 @@ [DEFAULT] X-Python3-Version : >= 3.5 -Maintainer: Alfonso Tierno -Depends3: python3-paramiko, python3-requests, python3-yaml, - diff --git a/RO-plugin/tox.ini b/RO-plugin/tox.ini deleted file mode 100644 index 4d8b9bec..00000000 --- a/RO-plugin/tox.ini +++ /dev/null @@ -1,41 +0,0 @@ -## -# 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. -## - -[tox] -envlist = flake8 -toxworkdir={toxinidir}/../.tox - -[testenv] -basepython = python3 -install_command = python3 -m pip install -r requirements.txt -U {opts} {packages} -# deps = -r{toxinidir}/test-requirements.txt -commands=python3 -m unittest discover -v - -[testenv:flake8] -basepython = python3 -deps = flake8 -commands = flake8 osm_ro_plugin --max-line-length 120 \ - --exclude .svn,CVS,.gz,.git,__pycache__,.tox,local,temp --ignore W291,W293,W503,W605,E123,E125,E203,E226,E241 - -[testenv:unittest] -basepython = python3 -commands = python3 -m unittest osm_ro_plugin.tests - -[testenv:build] -basepython = python3 -deps = stdeb - setuptools-version-command -commands = python3 setup.py --command-packages=stdeb.command bdist_deb - diff --git a/devops-stages/stage-build.sh b/devops-stages/stage-build.sh index a2f565a1..4ece8af7 100755 --- a/devops-stages/stage-build.sh +++ b/devops-stages/stage-build.sh @@ -1,5 +1,4 @@ #!/bin/bash - # 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 @@ -18,35 +17,49 @@ set -ex rm -rf deb_dist/* mkdir -p deb_dist -# main RO module -make -C RO clean package -cp RO/deb_dist/python3-osm-ro_*.deb deb_dist/ - -# RO client -make -C RO-client clean package -cp RO-client/deb_dist/python3-osm-roclient_*.deb deb_dist/ +# Building packages +tox -e dist_ro_plugin & +tox -e dist_ng_ro & +tox -e dist_ro_sdn_arista_cloudvision & +tox -e dist_ro_sdn_dpb & +tox -e dist_ro_sdn_dynpac & +tox -e dist_ro_sdn_floodlight_of & +tox -e dist_ro_sdn_ietfl2vpn & +tox -e dist_ro_sdn_juniper_contrail & +tox -e dist_ro_sdn_odl_of & +tox -e dist_ro_sdn_onos_of & +tox -e dist_ro_sdn_onos_vpls & +tox -e dist_ro_vim_aws & +tox -e dist_ro_vim_azure & +tox -e dist_ro_vim_fos & +tox -e dist_ro_vim_opennebula & +tox -e dist_ro_vim_openstack & +tox -e dist_ro_vim_openvim & +tox -e dist_ro_vim_vmware & +while true; do + wait -n || { + code="$?" + ([[ $code = "127" ]] && exit 0 || exit "$code") + break + } +done; +# Copying packages # RO plugin -make -C RO-plugin clean package cp RO-plugin/deb_dist/python3-osm-ro-plugin_*.deb deb_dist/ # NG-RO -make -C NG-RO clean package cp NG-RO/deb_dist/python3-osm-ng-ro_*.deb deb_dist/ # VIM plugings: vmware, openstack, AWS, fos, azure, Opennebula, for vim_plugin in RO-VIM-* do - make -C $vim_plugin clean package cp ${vim_plugin}/deb_dist/python3-osm-rovim*.deb deb_dist/ done # SDN plugins: DynPac, Ietfl2vpn, Onosof Floodlightof for sdn_plugin in RO-SDN-* do - [[ "$sdn_plugin" == RO-SDN-tapi ]] && continue # tapi folder appears at Jenkins due to container reuse - [[ "$sdn_plugin" == RO-SDN-arista ]] && continue # arista folder appears at Jenkins due to container reuse - make -C $sdn_plugin clean package cp ${sdn_plugin}/deb_dist/python3-osm-rosdn*.deb deb_dist/ done diff --git a/devops-stages/stage-test.sh b/devops-stages/stage-test.sh index 69d1fffe..2b39c48f 100755 --- a/devops-stages/stage-test.sh +++ b/devops-stages/stage-test.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -13,11 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -for tox_file in `ls */tox.ini` ; do - [ "$tox_file" = "RO-client/tox.ini" ] || [ "$tox_file" = "RO-VIM-vmware/tox.ini" ] || - [ "$tox_file" = "RO-VIM-openvim/tox.ini" ] || [ "$tox_file" = "build/tox.ini" ] && continue - echo - echo launching "$tox_file" - tox -c "$tox_file" --recreate || exit 1 -done - +echo launching tox +OUTPUT=$(TOX_PARALLEL_NO_SPINNER=1 tox --parallel=auto) +printf '%s\n' "$OUTPUT" diff --git a/nose2.cfg b/nose2.cfg new file mode 100644 index 00000000..648bd3d8 --- /dev/null +++ b/nose2.cfg @@ -0,0 +1,25 @@ +####################################################################################### +# Copyright ETSI Contributors and Others. +# +# 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. +####################################################################################### + +[unittest] +plugins = nose2.plugins.junitxml + +[junit-xml] +always-on = True +keep_restricted = False +path = nosetests.xml +test_fullname = False diff --git a/requirements-dev.in b/requirements-dev.in new file mode 100644 index 00000000..f7259c77 --- /dev/null +++ b/requirements-dev.in @@ -0,0 +1,18 @@ +# Copyright ETSI Contributors and Others. +# +# 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. +## + +git+https://osm.etsi.org/gerrit/osm/common.git@v9.0#egg=osm-common +-r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=v9.0 diff --git a/requirements-dev.txt b/requirements-dev.txt new file mode 100644 index 00000000..d21bb916 --- /dev/null +++ b/requirements-dev.txt @@ -0,0 +1,66 @@ +####################################################################################### +# Copyright ETSI Contributors and Others. +# +# 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. +####################################################################################### +# Copyright ETSI Contributors and Others. +# +# 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. +## + +git+https://osm.etsi.org/gerrit/osm/common.git@v9.0#egg=osm-common + # via -r requirements-dev.in +####################################################################################### +# Copyright ETSI Contributors and Others. +# +# 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. +####################################################################################### +####################################################################################### +# Copyright ETSI Contributors and Others. +# +# 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. +####################################################################################### diff --git a/requirements-dist.in b/requirements-dist.in new file mode 100644 index 00000000..501638f5 --- /dev/null +++ b/requirements-dist.in @@ -0,0 +1,18 @@ +# Copyright ETSI Contributors and Others. +# +# 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. +## + +stdeb +setuptools-version-command diff --git a/requirements-dist.txt b/requirements-dist.txt new file mode 100644 index 00000000..b32a04ab --- /dev/null +++ b/requirements-dist.txt @@ -0,0 +1,23 @@ +####################################################################################### +# Copyright ETSI Contributors and Others. +# +# 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. +####################################################################################### +setuptools-version-command==2.2 + # via -r requirements-dist.in +stdeb==0.10.0 + # via -r requirements-dist.in + +# The following packages are considered to be unsafe in a requirements file: +# setuptools diff --git a/requirements-test.in b/requirements-test.in new file mode 100644 index 00000000..6d957f8d --- /dev/null +++ b/requirements-test.in @@ -0,0 +1,20 @@ +# Copyright ETSI Contributors and Others. +# +# 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. +## + +-e RO-plugin +coverage +mock +nose2 diff --git a/requirements-test.txt b/requirements-test.txt new file mode 100644 index 00000000..928069ad --- /dev/null +++ b/requirements-test.txt @@ -0,0 +1,28 @@ +####################################################################################### +# Copyright ETSI Contributors and Others. +# +# 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. +####################################################################################### +-e file:///home/ed1000/Documents/osm/RO/RO-plugin + # via -r requirements-test.in +coverage==5.5 + # via + # -r requirements-test.in + # nose2 +mock==4.0.3 + # via -r requirements-test.in +nose2==0.10.0 + # via -r requirements-test.in +six==1.16.0 + # via nose2 diff --git a/requirements.in b/requirements.in new file mode 100644 index 00000000..a2d1d5e7 --- /dev/null +++ b/requirements.in @@ -0,0 +1,34 @@ +# Copyright ETSI Contributors and Others. +# +# 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. +## + +-r NG-RO/requirements.in +-r RO-plugin/requirements.in +-r RO-SDN-arista_cloudvision/requirements.in +-r RO-SDN-dpb/requirements.in +-r RO-SDN-dynpac/requirements.in +-r RO-SDN-floodlight_openflow/requirements.in +-r RO-SDN-ietfl2vpn/requirements.in +-r RO-SDN-juniper_contrail/requirements.in +-r RO-SDN-odl_openflow/requirements.in +-r RO-SDN-onos_openflow/requirements.in +-r RO-SDN-onos_vpls/requirements.in +-r RO-VIM-aws/requirements.in +-r RO-VIM-azure/requirements.in +-r RO-VIM-fos/requirements.in +-r RO-VIM-opennebula/requirements.in +-r RO-VIM-openstack/requirements.in +-r RO-VIM-openvim/requirements.in +-r RO-VIM-vmware/requirements.in diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 00000000..2c619594 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,1325 @@ +####################################################################################### +# Copyright ETSI Contributors and Others. +# +# 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. +####################################################################################### +adal==1.2.7 + # via + # azure-datalake-store + # msrestazure +aenum==3.0.0 + # via pyone +alabaster==0.7.12 + # via sphinx +alembic==1.5.8 + # via + # neutron + # oslo.db +amqp==5.0.6 + # via + # kombu + # oslo.messaging +appdirs==1.4.4 + # via openstacksdk +argparse==1.4.0 + # via unittest2 +attrs==20.3.0 + # via + # cmd2 + # jsonschema +azure-applicationinsights==0.1.0 + # via azure +azure-batch==4.1.3 + # via azure +azure-common==1.1.27 + # via + # azure-applicationinsights + # azure-batch + # azure-cosmosdb-table + # azure-eventgrid + # azure-graphrbac + # azure-keyvault + # azure-loganalytics + # azure-mgmt-advisor + # azure-mgmt-applicationinsights + # azure-mgmt-authorization + # azure-mgmt-batch + # azure-mgmt-batchai + # azure-mgmt-billing + # azure-mgmt-cdn + # azure-mgmt-cognitiveservices + # azure-mgmt-commerce + # azure-mgmt-compute + # azure-mgmt-consumption + # azure-mgmt-containerinstance + # azure-mgmt-containerregistry + # azure-mgmt-containerservice + # azure-mgmt-cosmosdb + # azure-mgmt-datafactory + # azure-mgmt-datalake-analytics + # azure-mgmt-datalake-store + # azure-mgmt-datamigration + # azure-mgmt-devspaces + # azure-mgmt-devtestlabs + # azure-mgmt-dns + # azure-mgmt-eventgrid + # azure-mgmt-eventhub + # azure-mgmt-hanaonazure + # azure-mgmt-iotcentral + # azure-mgmt-iothub + # azure-mgmt-iothubprovisioningservices + # azure-mgmt-keyvault + # azure-mgmt-loganalytics + # azure-mgmt-logic + # azure-mgmt-machinelearningcompute + # azure-mgmt-managementgroups + # azure-mgmt-managementpartner + # azure-mgmt-maps + # azure-mgmt-marketplaceordering + # azure-mgmt-media + # azure-mgmt-monitor + # azure-mgmt-msi + # azure-mgmt-network + # azure-mgmt-notificationhubs + # azure-mgmt-policyinsights + # azure-mgmt-powerbiembedded + # azure-mgmt-rdbms + # azure-mgmt-recoveryservices + # azure-mgmt-recoveryservicesbackup + # azure-mgmt-redis + # azure-mgmt-relay + # azure-mgmt-reservations + # azure-mgmt-resource + # azure-mgmt-scheduler + # azure-mgmt-search + # azure-mgmt-servicebus + # azure-mgmt-servicefabric + # azure-mgmt-signalr + # azure-mgmt-sql + # azure-mgmt-storage + # azure-mgmt-subscription + # azure-mgmt-trafficmanager + # azure-mgmt-web + # azure-servicebus + # azure-servicefabric + # azure-servicemanagement-legacy + # azure-storage-blob + # azure-storage-common + # azure-storage-file + # azure-storage-queue +azure-cosmosdb-nspkg==2.0.2 + # via azure-cosmosdb-table +azure-cosmosdb-table==1.0.6 + # via azure +azure-datalake-store==0.0.52 + # via azure +azure-eventgrid==1.3.0 + # via azure +azure-graphrbac==0.40.0 + # via azure +azure-keyvault==1.1.0 + # via azure +azure-loganalytics==0.1.0 + # via azure +azure-mgmt-advisor==1.0.1 + # via azure-mgmt +azure-mgmt-applicationinsights==0.1.1 + # via azure-mgmt +azure-mgmt-authorization==0.50.0 + # via azure-mgmt +azure-mgmt-batch==5.0.1 + # via azure-mgmt +azure-mgmt-batchai==2.0.0 + # via azure-mgmt +azure-mgmt-billing==0.2.0 + # via azure-mgmt +azure-mgmt-cdn==3.1.0 + # via azure-mgmt +azure-mgmt-cognitiveservices==3.0.0 + # via azure-mgmt +azure-mgmt-commerce==1.0.1 + # via azure-mgmt +azure-mgmt-compute==4.6.2 + # via azure-mgmt +azure-mgmt-consumption==2.0.0 + # via azure-mgmt +azure-mgmt-containerinstance==1.5.0 + # via azure-mgmt +azure-mgmt-containerregistry==2.8.0 + # via azure-mgmt +azure-mgmt-containerservice==4.4.0 + # via azure-mgmt +azure-mgmt-cosmosdb==0.4.1 + # via azure-mgmt +azure-mgmt-datafactory==0.6.0 + # via azure-mgmt +azure-mgmt-datalake-analytics==0.6.0 + # via azure-mgmt +azure-mgmt-datalake-nspkg==3.0.1 + # via + # azure-mgmt-datalake-analytics + # azure-mgmt-datalake-store +azure-mgmt-datalake-store==0.5.0 + # via azure-mgmt +azure-mgmt-datamigration==1.0.0 + # via azure-mgmt +azure-mgmt-devspaces==0.1.0 + # via azure-mgmt +azure-mgmt-devtestlabs==2.2.0 + # via azure-mgmt +azure-mgmt-dns==2.1.0 + # via azure-mgmt +azure-mgmt-eventgrid==1.0.0 + # via azure-mgmt +azure-mgmt-eventhub==2.6.0 + # via azure-mgmt +azure-mgmt-hanaonazure==0.1.1 + # via azure-mgmt +azure-mgmt-iotcentral==0.1.0 + # via azure-mgmt +azure-mgmt-iothub==0.5.0 + # via azure-mgmt +azure-mgmt-iothubprovisioningservices==0.2.0 + # via azure-mgmt +azure-mgmt-keyvault==1.1.0 + # via azure-mgmt +azure-mgmt-loganalytics==0.2.0 + # via azure-mgmt +azure-mgmt-logic==3.0.0 + # via azure-mgmt +azure-mgmt-machinelearningcompute==0.4.1 + # via azure-mgmt +azure-mgmt-managementgroups==0.1.0 + # via azure-mgmt +azure-mgmt-managementpartner==0.1.1 + # via azure-mgmt +azure-mgmt-maps==0.1.0 + # via azure-mgmt +azure-mgmt-marketplaceordering==0.1.0 + # via azure-mgmt +azure-mgmt-media==1.0.0 + # via azure-mgmt +azure-mgmt-monitor==0.5.2 + # via azure-mgmt +azure-mgmt-msi==0.2.0 + # via azure-mgmt +azure-mgmt-network==2.7.0 + # via azure-mgmt +azure-mgmt-notificationhubs==2.1.0 + # via azure-mgmt +azure-mgmt-nspkg==3.0.2 + # via + # azure-mgmt-advisor + # azure-mgmt-applicationinsights + # azure-mgmt-authorization + # azure-mgmt-batch + # azure-mgmt-batchai + # azure-mgmt-billing + # azure-mgmt-cognitiveservices + # azure-mgmt-commerce + # azure-mgmt-consumption + # azure-mgmt-cosmosdb + # azure-mgmt-datafactory + # azure-mgmt-datalake-nspkg + # azure-mgmt-datamigration + # azure-mgmt-devspaces + # azure-mgmt-devtestlabs + # azure-mgmt-dns + # azure-mgmt-eventgrid + # azure-mgmt-hanaonazure + # azure-mgmt-iotcentral + # azure-mgmt-iothub + # azure-mgmt-iothubprovisioningservices + # azure-mgmt-keyvault + # azure-mgmt-loganalytics + # azure-mgmt-logic + # azure-mgmt-machinelearningcompute + # azure-mgmt-managementgroups + # azure-mgmt-maps + # azure-mgmt-marketplaceordering + # azure-mgmt-monitor + # azure-mgmt-msi + # azure-mgmt-policyinsights + # azure-mgmt-powerbiembedded + # azure-mgmt-recoveryservices + # azure-mgmt-recoveryservicesbackup + # azure-mgmt-redis + # azure-mgmt-relay + # azure-mgmt-reservations + # azure-mgmt-scheduler + # azure-mgmt-servicefabric + # azure-mgmt-signalr + # azure-mgmt-sql + # azure-mgmt-storage + # azure-mgmt-subscription + # azure-mgmt-trafficmanager + # azure-mgmt-web +azure-mgmt-policyinsights==0.1.0 + # via azure-mgmt +azure-mgmt-powerbiembedded==2.0.0 + # via azure-mgmt +azure-mgmt-rdbms==1.9.0 + # via azure-mgmt +azure-mgmt-recoveryservices==0.3.0 + # via azure-mgmt +azure-mgmt-recoveryservicesbackup==0.3.0 + # via azure-mgmt +azure-mgmt-redis==5.0.0 + # via azure-mgmt +azure-mgmt-relay==0.1.0 + # via azure-mgmt +azure-mgmt-reservations==0.2.1 + # via azure-mgmt +azure-mgmt-resource==2.2.0 + # via azure-mgmt +azure-mgmt-scheduler==2.0.0 + # via azure-mgmt +azure-mgmt-search==2.1.0 + # via azure-mgmt +azure-mgmt-servicebus==0.5.3 + # via azure-mgmt +azure-mgmt-servicefabric==0.2.0 + # via azure-mgmt +azure-mgmt-signalr==0.1.1 + # via azure-mgmt +azure-mgmt-sql==0.9.1 + # via azure-mgmt +azure-mgmt-storage==2.0.0 + # via azure-mgmt +azure-mgmt-subscription==0.2.0 + # via azure-mgmt +azure-mgmt-trafficmanager==0.50.0 + # via azure-mgmt +azure-mgmt-web==0.35.0 + # via azure-mgmt +azure-mgmt==4.0.0 + # via azure +azure-nspkg==3.0.2 + # via + # azure-applicationinsights + # azure-batch + # azure-cosmosdb-nspkg + # azure-graphrbac + # azure-keyvault + # azure-loganalytics + # azure-mgmt-nspkg + # azure-servicebus + # azure-servicefabric + # azure-servicemanagement-legacy +azure-servicebus==0.21.1 + # via azure +azure-servicefabric==6.3.0.0 + # via azure +azure-servicemanagement-legacy==0.20.7 + # via azure +azure-storage-blob==1.5.0 + # via azure +azure-storage-common==1.4.2 + # via + # azure-storage-blob + # azure-storage-file + # azure-storage-queue +azure-storage-file==1.4.0 + # via azure +azure-storage-queue==1.4.0 + # via azure +azure==4.0.0 + # via -r RO-VIM-azure/requirements.in +babel==2.9.0 + # via + # os-xenapi + # sphinx +bcrypt==3.2.0 + # via paramiko +beautifulsoup4==4.9.3 + # via webtest +bitarray==1.9.2 + # via pyangbind +boto==2.49.0 + # via -r RO-VIM-aws/requirements.in +cachetools==4.2.1 + # via oslo.messaging +certifi==2020.12.5 + # via + # msrest + # requests +cffi==1.14.5 + # via + # azure-datalake-store + # bcrypt + # cryptography + # oslo.privsep + # pynacl +chardet==4.0.0 + # via requests +cheroot==8.5.2 + # via cherrypy +cherrypy==18.1.2 + # via -r NG-RO/requirements.in +cliff==3.7.0 + # via + # osc-lib + # python-designateclient + # python-neutronclient + # python-openstackclient +cmd2==1.5.0 + # via cliff +colorama==0.4.4 + # via cmd2 +cryptography==3.4.7 + # via + # -r NG-RO/requirements.in + # adal + # azure-cosmosdb-table + # azure-keyvault + # azure-storage-common + # openstacksdk + # paramiko + # pyopenssl +cvprac==1.0.5 + # via -r RO-SDN-arista_cloudvision/requirements.in +debtcollector==2.2.0 + # via + # neutron + # os-vif + # oslo.config + # oslo.context + # oslo.db + # oslo.log + # oslo.messaging + # oslo.middleware + # oslo.service + # oslo.utils + # pycadf + # python-designateclient + # python-keystoneclient + # python-neutronclient +decorator==5.0.6 + # via + # dogpile.cache + # neutron + # openstacksdk + # sqlalchemy-migrate +dicttoxml==1.7.4 + # via pyone +dnspython==1.16.0 + # via eventlet +docutils==0.16 + # via sphinx +dogpile.cache==1.1.2 + # via + # openstacksdk + # oslo.cache +enum34==1.1.10 + # via pyangbind +eventlet==0.30.2 + # via + # neutron + # os-ken + # os-xenapi + # oslo.privsep + # oslo.service +extras==1.0.0 + # via testtools +fasteners==0.16 + # via + # oslo.concurrency + # tooz +fixtures==3.0.0 + # via + # oslo.service + # ovsdbapp + # testtools +flufl.enum==4.1.1 + # via pyvcloud +fog05-sdk==0.2.0 + # via + # -r RO-VIM-fos/requirements.in + # fog05 +fog05==0.2.0 + # via -r RO-VIM-fos/requirements.in +futurist==2.3.0 + # via + # neutron + # oslo.messaging + # tooz +greenlet==1.0.0 + # via + # eventlet + # oslo.privsep + # oslo.service + # sqlalchemy +hexdump==3.3 + # via yaks +httplib2==0.19.1 + # via neutron +humanfriendly==9.1 + # via pyvcloud +idna==2.10 + # via requests +imagesize==1.2.0 + # via sphinx +importlib-metadata==3.10.1 + # via -r NG-RO/requirements.in +iso8601==0.1.14 + # via + # keystoneauth1 + # openstacksdk + # oslo.utils + # oslo.versionedobjects + # python-neutronclient + # python-novaclient + # python-openstackclient +isodate==0.6.0 + # via msrest +jaraco.functools==3.3.0 + # via + # cheroot + # tempora +jinja2==2.11.3 + # via + # neutron + # oslo.middleware + # oslo.reports + # sphinx +jmespath==0.10.0 + # via openstacksdk +jsonpatch==1.32 + # via + # openstacksdk + # warlock +jsonpointer==2.1 + # via jsonpatch +jsonschema==3.2.0 + # via + # fog05 + # fog05-sdk + # python-designateclient + # warlock +keystoneauth1==4.3.1 + # via + # keystonemiddleware + # neutron + # neutron-lib + # openstacksdk + # osc-lib + # python-cinderclient + # python-designateclient + # python-glanceclient + # python-keystoneclient + # python-neutronclient + # python-novaclient +keystonemiddleware==9.2.0 + # via neutron +kombu==5.0.2 + # via oslo.messaging +linecache2==1.0.0 + # via traceback2 +logutils==0.3.5 + # via + # -r NG-RO/requirements.in + # pecan +lxml==4.6.3 + # via + # pyang + # pyangbind + # pyone + # pyvcloud +mako==1.1.4 + # via + # alembic + # pecan +markupsafe==1.1.1 + # via + # jinja2 + # mako +more-itertools==8.7.0 + # via + # cheroot + # cherrypy + # jaraco.functools +msgpack==1.0.2 + # via + # os-ken + # oslo.privsep + # oslo.serialization + # tooz +msrest==0.6.21 + # via + # azure-applicationinsights + # azure-eventgrid + # azure-keyvault + # azure-loganalytics + # azure-mgmt-cdn + # azure-mgmt-compute + # azure-mgmt-containerinstance + # azure-mgmt-containerregistry + # azure-mgmt-containerservice + # azure-mgmt-dns + # azure-mgmt-eventhub + # azure-mgmt-keyvault + # azure-mgmt-managementpartner + # azure-mgmt-media + # azure-mgmt-network + # azure-mgmt-notificationhubs + # azure-mgmt-rdbms + # azure-mgmt-resource + # azure-mgmt-search + # azure-mgmt-servicebus + # azure-mgmt-servicefabric + # azure-mgmt-signalr + # azure-servicefabric + # msrestazure +msrestazure==0.6.4 + # via + # azure-batch + # azure-eventgrid + # azure-graphrbac + # azure-keyvault + # azure-mgmt-advisor + # azure-mgmt-applicationinsights + # azure-mgmt-authorization + # azure-mgmt-batch + # azure-mgmt-batchai + # azure-mgmt-billing + # azure-mgmt-cdn + # azure-mgmt-cognitiveservices + # azure-mgmt-commerce + # azure-mgmt-compute + # azure-mgmt-consumption + # azure-mgmt-containerinstance + # azure-mgmt-containerregistry + # azure-mgmt-containerservice + # azure-mgmt-cosmosdb + # azure-mgmt-datafactory + # azure-mgmt-datalake-analytics + # azure-mgmt-datalake-store + # azure-mgmt-datamigration + # azure-mgmt-devspaces + # azure-mgmt-devtestlabs + # azure-mgmt-dns + # azure-mgmt-eventgrid + # azure-mgmt-eventhub + # azure-mgmt-hanaonazure + # azure-mgmt-iotcentral + # azure-mgmt-iothub + # azure-mgmt-iothubprovisioningservices + # azure-mgmt-keyvault + # azure-mgmt-loganalytics + # azure-mgmt-logic + # azure-mgmt-machinelearningcompute + # azure-mgmt-managementgroups + # azure-mgmt-managementpartner + # azure-mgmt-maps + # azure-mgmt-marketplaceordering + # azure-mgmt-media + # azure-mgmt-monitor + # azure-mgmt-msi + # azure-mgmt-network + # azure-mgmt-notificationhubs + # azure-mgmt-policyinsights + # azure-mgmt-powerbiembedded + # azure-mgmt-rdbms + # azure-mgmt-recoveryservices + # azure-mgmt-recoveryservicesbackup + # azure-mgmt-redis + # azure-mgmt-relay + # azure-mgmt-reservations + # azure-mgmt-resource + # azure-mgmt-scheduler + # azure-mgmt-search + # azure-mgmt-servicebus + # azure-mgmt-servicefabric + # azure-mgmt-signalr + # azure-mgmt-sql + # azure-mgmt-storage + # azure-mgmt-subscription + # azure-mgmt-trafficmanager + # azure-mgmt-web +munch==2.5.0 + # via openstacksdk +mvar==0.0.1 + # via + # fog05 + # fog05-sdk + # yaks +netaddr==0.8.0 + # via + # -r RO-VIM-aws/requirements.in + # -r RO-VIM-azure/requirements.in + # -r RO-VIM-fos/requirements.in + # -r RO-VIM-opennebula/requirements.in + # -r RO-VIM-openstack/requirements.in + # -r RO-VIM-openvim/requirements.in + # -r RO-VIM-vmware/requirements.in + # neutron + # neutron-lib + # os-ken + # os-vif + # oslo.config + # oslo.utils + # oslo.versionedobjects + # osprofiler + # ovsdbapp + # python-neutronclient +netifaces==0.10.9 + # via + # neutron + # openstacksdk + # oslo.utils +networking-l2gw==18.0.0 + # via -r RO-VIM-openstack/requirements.in +neutron-lib==2.10.1 + # via + # networking-l2gw + # neutron +neutron==17.1.1 + # via networking-l2gw +oauthlib==3.1.0 + # via requests-oauthlib +oca==4.10.0 + # via -r RO-VIM-opennebula/requirements.in +openstacksdk==0.55.0 + # via + # neutron + # os-client-config + # osc-lib + # python-openstackclient +os-client-config==2.1.0 + # via python-neutronclient +os-ken==1.4.0 + # via + # neutron + # neutron-lib +os-service-types==1.7.0 + # via + # keystoneauth1 + # openstacksdk +os-traits==2.5.0 + # via neutron-lib +os-vif==2.4.0 + # via neutron +os-xenapi==0.3.4 + # via neutron +osc-lib==2.3.1 + # via + # python-designateclient + # python-neutronclient + # python-openstackclient +oslo.cache==2.7.0 + # via + # keystonemiddleware + # neutron +oslo.concurrency==4.4.0 + # via + # neutron + # neutron-lib + # os-vif + # os-xenapi + # oslo.service + # oslo.versionedobjects + # osprofiler +oslo.config==8.5.0 + # via + # keystonemiddleware + # neutron + # neutron-lib + # os-ken + # os-vif + # oslo.cache + # oslo.concurrency + # oslo.db + # oslo.log + # oslo.messaging + # oslo.middleware + # oslo.policy + # oslo.privsep + # oslo.service + # oslo.upgradecheck + # oslo.versionedobjects + # pycadf + # python-keystoneclient +oslo.context==3.2.0 + # via + # keystonemiddleware + # neutron + # neutron-lib + # oslo.log + # oslo.middleware + # oslo.policy + # oslo.versionedobjects +oslo.db==8.5.0 + # via + # neutron + # neutron-lib +oslo.i18n==5.0.1 + # via + # keystonemiddleware + # neutron + # neutron-lib + # os-vif + # os-xenapi + # osc-lib + # oslo.cache + # oslo.concurrency + # oslo.config + # oslo.db + # oslo.log + # oslo.middleware + # oslo.policy + # oslo.privsep + # oslo.reports + # oslo.service + # oslo.upgradecheck + # oslo.utils + # oslo.versionedobjects + # python-cinderclient + # python-glanceclient + # python-keystoneclient + # python-neutronclient + # python-novaclient + # python-openstackclient +oslo.log==4.4.0 + # via + # keystonemiddleware + # neutron + # neutron-lib + # os-vif + # os-xenapi + # oslo.cache + # oslo.messaging + # oslo.privsep + # oslo.service + # oslo.versionedobjects + # python-neutronclient +oslo.messaging==12.7.1 + # via + # neutron + # neutron-lib + # oslo.versionedobjects +oslo.middleware==4.2.0 + # via + # neutron + # oslo.messaging +oslo.policy==3.7.0 + # via + # neutron + # neutron-lib + # oslo.upgradecheck +oslo.privsep==2.5.0 + # via + # neutron + # os-vif +oslo.reports==2.2.0 + # via neutron +oslo.rootwrap==6.2.0 + # via neutron +oslo.serialization==4.1.0 + # via + # keystonemiddleware + # neutron + # neutron-lib + # oslo.log + # oslo.messaging + # oslo.policy + # oslo.reports + # oslo.versionedobjects + # osprofiler + # pycadf + # python-designateclient + # python-keystoneclient + # python-neutronclient + # python-novaclient + # tooz +oslo.service==2.5.0 + # via + # neutron + # neutron-lib + # oslo.messaging +oslo.upgradecheck==1.3.0 + # via neutron +oslo.utils==4.8.0 + # via + # keystonemiddleware + # neutron + # neutron-lib + # os-xenapi + # osc-lib + # oslo.cache + # oslo.concurrency + # oslo.db + # oslo.log + # oslo.messaging + # oslo.middleware + # oslo.policy + # oslo.privsep + # oslo.reports + # oslo.serialization + # oslo.service + # oslo.upgradecheck + # oslo.versionedobjects + # osprofiler + # python-cinderclient + # python-designateclient + # python-glanceclient + # python-keystoneclient + # python-neutronclient + # python-novaclient + # python-openstackclient + # tooz +oslo.versionedobjects==2.4.0 + # via + # neutron + # neutron-lib + # os-vif +osprofiler==3.4.0 + # via + # neutron + # neutron-lib +ovs==2.13.3 + # via + # neutron + # os-ken + # ovsdbapp +ovsdbapp==1.9.0 + # via + # networking-l2gw + # neutron + # os-vif +packaging==20.9 + # via + # oslo.utils + # sphinx +papero==0.2.7 + # via yaks +paramiko==2.7.2 + # via + # -r RO-SDN-dpb/requirements.in + # -r RO-plugin/requirements.in + # os-xenapi +paste==3.5.0 + # via + # neutron + # oslo.service +pastedeploy==2.1.1 + # via + # neutron + # oslo.service +pbr==5.5.1 + # via + # cliff + # debtcollector + # fixtures + # futurist + # keystoneauth1 + # keystonemiddleware + # networking-l2gw + # neutron + # neutron-lib + # openstacksdk + # os-ken + # os-service-types + # os-traits + # os-vif + # os-xenapi + # osc-lib + # oslo.concurrency + # oslo.context + # oslo.db + # oslo.i18n + # oslo.log + # oslo.messaging + # oslo.middleware + # oslo.reports + # oslo.serialization + # oslo.utils + # ovsdbapp + # python-cinderclient + # python-designateclient + # python-glanceclient + # python-keystoneclient + # python-neutronclient + # python-novaclient + # python-openstackclient + # sqlalchemy-migrate + # stevedore + # testresources + # testscenarios + # testtools + # tooz +pecan==1.4.0 + # via + # neutron + # neutron-lib +portend==2.7.1 + # via cherrypy +prettytable==0.7.2 + # via + # -r RO-VIM-vmware/requirements.in + # cliff + # oslo.upgradecheck + # osprofiler + # python-cinderclient + # python-glanceclient + # python-novaclient +progressbar==2.5 + # via -r RO-VIM-vmware/requirements.in +psutil==5.8.0 + # via + # neutron + # oslo.reports +pyang==2.4.0 + # via pyangbind +pyangbind==0.8.1 + # via + # -r RO-VIM-fos/requirements.in + # fog05-sdk +pycadf==3.1.1 + # via keystonemiddleware +pycparser==2.20 + # via cffi +pygments==2.8.1 + # via + # pyvcloud + # sphinx +pyinotify==0.9.6 + # via oslo.log +pyjwt==2.0.1 + # via adal +pynacl==1.4.0 + # via paramiko +pyone==6.0.0 + # via -r RO-VIM-opennebula/requirements.in +pyopenssl==20.0.1 + # via + # neutron + # python-glanceclient +pyparsing==2.4.7 + # via + # cliff + # httplib2 + # oslo.utils + # packaging +pyperclip==1.8.2 + # via cmd2 +pyroute2==0.5.18 + # via + # neutron + # os-vif +pyrsistent==0.17.3 + # via jsonschema +python-cinderclient==7.4.0 + # via + # -r RO-VIM-openstack/requirements.in + # python-openstackclient +python-dateutil==2.8.1 + # via + # adal + # alembic + # azure-cosmosdb-table + # azure-storage-common + # oslo.log +python-designateclient==4.2.0 + # via neutron +python-editor==1.0.4 + # via alembic +python-glanceclient==3.3.0 + # via -r RO-VIM-openstack/requirements.in +python-keystoneclient==4.2.0 + # via + # -r RO-VIM-openstack/requirements.in + # keystonemiddleware + # python-neutronclient + # python-openstackclient +python-mimeparse==1.6.0 + # via testtools +python-neutronclient==7.3.0 + # via + # -r RO-VIM-openstack/requirements.in + # networking-l2gw + # neutron +python-novaclient==17.4.0 + # via + # -r RO-VIM-openstack/requirements.in + # neutron + # python-openstackclient +python-openstackclient==5.5.0 + # via -r RO-VIM-openstack/requirements.in +pytz==2021.1 + # via + # babel + # oslo.serialization + # oslo.utils + # pycadf + # tempora +pyvcloud==19.1.1 + # via -r RO-VIM-vmware/requirements.in +pyvmomi==7.0.2 + # via -r RO-VIM-vmware/requirements.in +pyyaml==5.4.1 + # via + # -r NG-RO/requirements.in + # -r RO-VIM-aws/requirements.in + # -r RO-VIM-azure/requirements.in + # -r RO-VIM-fos/requirements.in + # -r RO-VIM-opennebula/requirements.in + # -r RO-VIM-openstack/requirements.in + # -r RO-VIM-openvim/requirements.in + # -r RO-VIM-vmware/requirements.in + # -r RO-plugin/requirements.in + # cliff + # openstacksdk + # oslo.config + # oslo.messaging + # oslo.policy + # pyvcloud +regex==2021.4.4 + # via pyangbind +repoze.lru==0.7 + # via routes +requests-oauthlib==1.3.0 + # via msrest +requests==2.25.1 + # via + # -r NG-RO/requirements.in + # -r RO-SDN-arista_cloudvision/requirements.in + # -r RO-SDN-dpb/requirements.in + # -r RO-SDN-dynpac/requirements.in + # -r RO-SDN-floodlight_openflow/requirements.in + # -r RO-SDN-ietfl2vpn/requirements.in + # -r RO-SDN-juniper_contrail/requirements.in + # -r RO-SDN-odl_openflow/requirements.in + # -r RO-SDN-onos_openflow/requirements.in + # -r RO-SDN-onos_vpls/requirements.in + # -r RO-VIM-aws/requirements.in + # -r RO-VIM-azure/requirements.in + # -r RO-VIM-fos/requirements.in + # -r RO-VIM-opennebula/requirements.in + # -r RO-VIM-openstack/requirements.in + # -r RO-VIM-openvim/requirements.in + # -r RO-VIM-vmware/requirements.in + # -r RO-plugin/requirements.in + # adal + # azure-cosmosdb-table + # azure-datalake-store + # azure-keyvault + # azure-servicebus + # azure-servicemanagement-legacy + # azure-storage-common + # cvprac + # keystoneauth1 + # keystonemiddleware + # msrest + # neutron + # oslo.config + # oslo.policy + # osprofiler + # pyone + # python-cinderclient + # python-designateclient + # python-glanceclient + # python-keystoneclient + # python-neutronclient + # pyvcloud + # pyvmomi + # requests-oauthlib + # sphinx +requestsexceptions==1.4.0 + # via openstacksdk +rfc3986==1.4.0 + # via oslo.config +routes==2.5.1 + # via + # neutron + # os-ken + # oslo.service +setproctitle==1.2.2 + # via neutron-lib +simplejson==3.17.2 + # via + # osc-lib + # python-cinderclient + # python-neutronclient +six==1.15.0 + # via + # bcrypt + # cheroot + # debtcollector + # eventlet + # fasteners + # fixtures + # futurist + # isodate + # jsonschema + # keystoneauth1 + # keystonemiddleware + # msrestazure + # munch + # os-ken + # os-xenapi + # oslo.i18n + # oslo.reports + # oslo.rootwrap + # osprofiler + # paste + # pecan + # pyangbind + # pycadf + # pynacl + # pyone + # pyopenssl + # python-dateutil + # python-designateclient + # python-keystoneclient + # pyvmomi + # routes + # sqlalchemy-migrate + # tenacity + # testtools + # tinyrpc + # unittest2 + # warlock + # webtest +snowballstemmer==2.1.0 + # via sphinx +sortedcontainers==2.3.0 + # via ovs +soupsieve==2.2.1 + # via beautifulsoup4 +sphinx==3.5.4 + # via -r RO-VIM-fos/requirements.in +sphinxcontrib-applehelp==1.0.2 + # via sphinx +sphinxcontrib-devhelp==1.0.2 + # via sphinx +sphinxcontrib-htmlhelp==1.0.3 + # via sphinx +sphinxcontrib-jsmath==1.0.1 + # via sphinx +sphinxcontrib-qthelp==1.0.3 + # via sphinx +sphinxcontrib-serializinghtml==1.1.4 + # via sphinx +sqlalchemy-migrate==0.13.0 + # via oslo.db +sqlalchemy==1.4.7 + # via + # alembic + # neutron + # neutron-lib + # oslo.db + # sqlalchemy-migrate +sqlparse==0.4.1 + # via sqlalchemy-migrate +statsd==3.3.0 + # via oslo.middleware +stevedore==3.3.0 + # via + # cliff + # dogpile.cache + # keystoneauth1 + # neutron + # neutron-lib + # os-vif + # osc-lib + # oslo.config + # oslo.db + # oslo.messaging + # oslo.middleware + # oslo.policy + # python-cinderclient + # python-designateclient + # python-keystoneclient + # python-novaclient + # python-openstackclient + # tooz +tblib==1.7.0 + # via pyone +tempita==0.5.2 + # via sqlalchemy-migrate +tempora==4.0.2 + # via portend +tenacity==7.0.0 + # via + # neutron + # tooz +testresources==2.0.1 + # via oslo.db +testscenarios==0.5.0 + # via oslo.db +testtools==2.4.0 + # via + # fixtures + # testscenarios +tinyrpc==1.0.4 + # via os-ken +tooz==2.8.0 + # via neutron +traceback2==1.4.0 + # via + # testtools + # unittest2 +unittest2==1.1.0 + # via testtools +urllib3==1.26.4 + # via requests +uuid==1.30 + # via -r RO-SDN-arista_cloudvision/requirements.in +vine==5.0.0 + # via amqp +voluptuous==0.12.1 + # via tooz +waitress==2.0.0 + # via webtest +warlock==1.3.3 + # via python-glanceclient +wcwidth==0.2.5 + # via cmd2 +webob==1.8.7 + # via + # keystonemiddleware + # neutron + # neutron-lib + # os-ken + # oslo.messaging + # oslo.middleware + # oslo.service + # oslo.versionedobjects + # osprofiler + # pecan + # webtest +webtest==2.0.35 + # via pecan +wrapt==1.12.1 + # via + # debtcollector + # python-glanceclient +xmltodict==0.12.0 + # via pyone +yaks==0.3.0.post1 + # via + # -r RO-VIM-fos/requirements.in + # fog05 + # fog05-sdk +yappi==1.3.2 + # via oslo.service +zc.lockfile==2.0 + # via cherrypy +zenoh==0.3.0 + # via -r RO-VIM-fos/requirements.in +zipp==3.4.1 + # via importlib-metadata + +# The following packages are considered to be unsafe in a requirements file: +# setuptools diff --git a/tox.ini b/tox.ini new file mode 100644 index 00000000..8a1cc7f8 --- /dev/null +++ b/tox.ini @@ -0,0 +1,441 @@ +####################################################################################### +# Copyright ETSI Contributors and Others. +# +# 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. +####################################################################################### + +[tox] +envlist = black, flake8, pylint, safety + +[tox:jenkins] +toxworkdir = /tmp/.tox + +[testenv] +usedevelop = True +basepython = python3 +setenv = VIRTUAL_ENV={envdir} + PYTHONDONTWRITEBYTECODE = 1 +deps = -r{toxinidir}/requirements.txt +parallel_show_output = true + + +####################################################################################### +[testenv:black] +deps = black +skip_install = true +commands = + - black --check --diff NG-RO + - black --check --diff RO-plugin + - black --check --diff RO-SDN-arista_cloudvision + - black --check --diff RO-SDN-dpb + - black --check --diff RO-SDN-dynpac + - black --check --diff RO-SDN-floodlight_openflow + - black --check --diff RO-SDN-ietfl2vpn + - black --check --diff RO-SDN-juniper_contrail + - black --check --diff RO-SDN-odl_openflow + - black --check --diff RO-SDN-onos_openflow + - black --check --diff RO-SDN-onos_vpls + - black --check --diff RO-VIM-aws + - black --check --diff RO-VIM-azure + - black --check --diff RO-VIM-fos + - black --check --diff RO-VIM-opennebula + - black --check --diff RO-VIM-openstack + - black --check --diff RO-VIM-openvim + - black --check --diff RO-VIM-vmware + + +####################################################################################### +[testenv:cover] +deps = {[testenv]deps} + -r{toxinidir}/requirements-dev.txt + -r{toxinidir}/requirements-test.txt +skip_install = true +commands = + sh -c 'rm -f nosetests.xml' + coverage erase + # NG-RO + - nose2 -C --coverage NG-RO/osm_ng_ro + sh -c 'mv .coverage .coverage_ng_ro' + # RO-plugin + - nose2 -C --coverage RO-plugin/osm_ro_plugin + sh -c 'mv .coverage .coverage_ro_plugin' + # RO-SDN-arista_cloudvision + - nose2 -C --coverage RO-SDN-arista_cloudvision/osm_rosdn_arista_cloudvision + sh -c 'mv .coverage .coverage_rosdn_arista_cloudvision' + # RO-SDN-dpb + - nose2 -C --coverage RO-SDN-dpb/osm_rosdn_dpb + sh -c 'mv .coverage .coverage_rosdn_dpb' + # RO-SDN-dynpac + - nose2 -C --coverage RO-SDN-dynpac/osm_rosdn_dynpac + sh -c 'mv .coverage .coverage_rosdn_dynpac' + # RO-SDN-floodlight_openflow + - nose2 -C --coverage RO-SDN-floodlight_openflow/osm_rosdn_floodlightof + sh -c 'mv .coverage .coverage_rosdn_floodlightof' + # RO-SDN-ietfl2vpn + - nose2 -C --coverage RO-SDN-ietfl2vpn/osm_rosdn_ietfl2vpn + sh -c 'mv .coverage .coverage_rosdn_ietfl2vpn' + # RO-SDN-juniper_contrail + - nose2 -C --coverage RO-SDN-juniper_contrail/osm_rosdn_juniper_contrail + sh -c 'mv .coverage .coverage_rosdn_juniper_contrail' + # RO-SDN-odl_openflow + - nose2 -C --coverage RO-SDN-odl_openflow/osm_rosdn_odlof + sh -c 'mv .coverage .coverage_rosdn_odlof' + # RO-SDN-onos_openflow + - nose2 -C --coverage RO-SDN-onos_openflow/osm_rosdn_onosof + sh -c 'mv .coverage .coverage_rosdn_onosof' + # RO-SDN-onos_vpls + - nose2 -C --coverage RO-SDN-onos_vpls/osm_rosdn_onos_vpls + sh -c 'mv .coverage .coverage_rosdn_onos_vpls' + # RO-VIM-aws + - nose2 -C --coverage RO-VIM-aws/osm_rovim_aws + sh -c 'mv .coverage .coverage_rovim_aws' + # RO-VIM-azure + - nose2 -C --coverage RO-VIM-azure/osm_rovim_azure + sh -c 'mv .coverage .coverage_rovim_azure' + # RO-VIM-fos + - nose2 -C --coverage RO-VIM-fos/osm_rovim_fos + sh -c 'mv .coverage .coverage_rovim_fos' + # RO-VIM-opennebula + - nose2 -C --coverage RO-VIM-opennebula/osm_rovim_opennebula + sh -c 'mv .coverage .coverage_rovim_opennebula' + # RO-VIM-openstack + - nose2 -C --coverage RO-VIM-openstack/osm_rovim_openstack -s RO-VIM-openstack/osm_rovim_openstack + sh -c 'mv .coverage .coverage_rovim_openstack' + # RO-VIM-openvim + - nose2 -C --coverage RO-VIM-openvim/osm_rovim_openvim + sh -c 'mv .coverage .coverage_rovim_openvim' + # RO-VIM-vmware + - nose2 -C --coverage RO-VIM-vmware/osm_rovim_vmware -s RO-VIM-vmware/osm_rovim_vmware + sh -c 'mv .coverage .coverage_rovim_vmware' + # Combine results and generate reports + coverage combine .coverage_ng_ro .coverage_ro_plugin .coverage_rosdn_arista_cloudvision .coverage_rosdn_dpb .coverage_rosdn_dynpac .coverage_rosdn_floodlightof .coverage_rosdn_ietfl2vpn .coverage_rosdn_juniper_contrail .coverage_rosdn_odlof .coverage_rosdn_onos_vpls .coverage_rosdn_onosof .coverage_rovim_aws .coverage_rovim_azure .coverage_rovim_fos .coverage_rovim_opennebula .coverage_rovim_openstack .coverage_rovim_openvim .coverage_rovim_vmware + coverage report --omit='*tests*' + coverage html -d ./cover --omit='*tests*' + coverage xml -o coverage.xml --omit='*tests*' +whitelist_externals = sh + + +####################################################################################### +[testenv:flake8] +deps = flake8 +skip_install = true +commands = + - flake8 NG-RO/osm_ng_ro/ NG-RO/setup.py + - flake8 RO-plugin/osm_ro_plugin/ RO-plugin/setup.py + - flake8 RO-SDN-arista_cloudvision/osm_rosdn_arista_cloudvision/ RO-SDN-arista_cloudvision/setup.py + - flake8 RO-SDN-dpb/osm_rosdn_dpb/ RO-SDN-dpb/setup.py + - flake8 RO-SDN-dynpac/osm_rosdn_dynpac/ RO-SDN-dynpac/setup.py + - flake8 RO-SDN-floodlight_openflow/osm_rosdn_floodlightof/ RO-SDN-floodlight_openflow/setup.py + - flake8 RO-SDN-ietfl2vpn/osm_rosdn_ietfl2vpn/ RO-SDN-ietfl2vpn/setup.py + - flake8 RO-SDN-juniper_contrail/osm_rosdn_juniper_contrail/ RO-SDN-juniper_contrail/setup.py + - flake8 RO-SDN-odl_openflow/osm_rosdn_odlof/ RO-SDN-odl_openflow/setup.py + - flake8 RO-SDN-onos_openflow/osm_rosdn_onosof/ RO-SDN-onos_openflow/setup.py + - flake8 RO-SDN-onos_vpls/osm_rosdn_onos_vpls/ RO-SDN-onos_vpls/setup.py + - flake8 RO-VIM-aws/osm_rovim_aws/ RO-VIM-aws/setup.py + - flake8 RO-VIM-azure/osm_rovim_azure/ RO-VIM-azure/setup.py + - flake8 RO-VIM-fos/osm_rovim_fos/ RO-VIM-fos/setup.py + - flake8 RO-VIM-opennebula/osm_rovim_opennebula/ RO-VIM-opennebula/setup.py + - flake8 RO-VIM-openstack/osm_rovim_openstack/ RO-VIM-openstack/setup.py + - flake8 RO-VIM-openvim/osm_rovim_openvim/ RO-VIM-openvim/setup.py + - flake8 RO-VIM-vmware/osm_rovim_vmware/vimconn_vmware.py RO-VIM-vmware/osm_rovim_vmware/tests/test_vimconn_vmware.py RO-VIM-vmware/setup.py + + +####################################################################################### +[testenv:pylint] +deps = {[testenv]deps} + -r{toxinidir}/requirements-dev.txt + -r{toxinidir}/requirements-test.txt + pylint +skip_install = true +commands = + - pylint -E NG-RO/osm_ng_ro + - pylint -E RO-plugin/osm_ro_plugin + - pylint -E RO-SDN-arista_cloudvision/osm_rosdn_arista_cloudvision + - pylint -E RO-SDN-dpb/osm_rosdn_dpb + - pylint -E RO-SDN-dynpac/osm_rosdn_dynpac + - pylint -E RO-SDN-floodlight_openflow/osm_rosdn_floodlightof + - pylint -E RO-SDN-ietfl2vpn/osm_rosdn_ietfl2vpn + - pylint -E RO-SDN-juniper_contrail/osm_rosdn_juniper_contrail + - pylint -E RO-SDN-odl_openflow/osm_rosdn_odlof + - pylint -E RO-SDN-onos_openflow/osm_rosdn_onosof + - pylint -E RO-SDN-onos_vpls/osm_rosdn_onos_vpls + - pylint -E RO-VIM-aws/osm_rovim_aws + - pylint -E RO-VIM-azure/osm_rovim_azure + - pylint -E RO-VIM-fos/osm_rovim_fos + - pylint -E RO-VIM-opennebula/osm_rovim_opennebula + - pylint -E RO-VIM-openstack/osm_rovim_openstack + - pylint -E RO-VIM-openvim/osm_rovim_openvim + - pylint -E RO-VIM-vmware/osm_rovim_vmware + + +####################################################################################### +[testenv:safety] +setenv = + LC_ALL=C.UTF-8 + LANG=C.UTF-8 +deps = {[testenv]deps} + safety +skip_install = true +commands = + - safety check --full-report + + +####################################################################################### +[testenv:pip-compile] +deps = pip-tools==5.5.0 +skip_install = true +commands = + - sh -c "for file in requirements*.in ; do pip-compile -rU --no-header $file ;\ + out=`echo $file | sed 's/.in/.txt/'` ;\ + sed -i -e '1 e head -16 tox.ini' $out ;\ + done" +whitelist_externals = sh + + +####################################################################################### +[testenv:dist_ng_ro] +deps = {[testenv]deps} + -r{toxinidir}/requirements-dist.txt +skip_install = true +changedir = {toxinidir}/NG-RO +commands = + sh -c 'rm -rf osm_ng_ro/requirements.txt deb_dist dist osm_ng_ro.egg-info osm_ng_ro*.tar.gz' + sh -c 'cp ../requirements.txt osm_ng_ro/requirements.txt' + python3 setup.py --command-packages=stdeb.command sdist_dsc + sh -c 'cd deb_dist/osm-ng-ro*/ && dpkg-buildpackage -rfakeroot -uc -us' +whitelist_externals = sh + +####################################################################################### +[testenv:dist_ro_plugin] +deps = {[testenv]deps} + -r{toxinidir}/requirements-dist.txt +skip_install = true +changedir = {toxinidir}/RO-plugin +commands = + sh -c 'rm -rf deb_dist dist osm_ro_plugin.egg-info osm_ro_plugin*.tar.gz' + python3 setup.py --command-packages=stdeb.command sdist_dsc + sh -c 'cd deb_dist/osm-ro-plugin*/ && dpkg-buildpackage -rfakeroot -uc -us' +whitelist_externals = sh + +####################################################################################### +[testenv:dist_ro_sdn_arista_cloudvision] +deps = {[testenv]deps} + -r{toxinidir}/requirements-dist.txt +skip_install = true +changedir = {toxinidir}/RO-SDN-arista_cloudvision +commands = + sh -c 'rm -rf deb_dist dist osm_rosdn_arista_cloudvision.egg-info osm_rosdn_arista_cloudvision*.tar.gz' + python3 setup.py --command-packages=stdeb.command sdist_dsc + sh -c 'cd deb_dist/osm-rosdn-arista-cloudvision*/ && dpkg-buildpackage -rfakeroot -uc -us' +whitelist_externals = sh + +####################################################################################### +[testenv:dist_ro_sdn_dpb] +deps = {[testenv]deps} + -r{toxinidir}/requirements-dist.txt +skip_install = true +changedir = {toxinidir}/RO-SDN-dpb +commands = + sh -c 'rm -rf deb_dist dist osm_rosdn_dpb.egg-info osm_rosdn_dpb*.tar.gz' + python3 setup.py --command-packages=stdeb.command sdist_dsc + sh -c 'cd deb_dist/osm-rosdn-dpb*/ && dpkg-buildpackage -rfakeroot -uc -us' +whitelist_externals = sh + +####################################################################################### +[testenv:dist_ro_sdn_dynpac] +deps = {[testenv]deps} + -r{toxinidir}/requirements-dist.txt +skip_install = true +changedir = {toxinidir}/RO-SDN-dynpac +commands = + sh -c 'rm -rf deb_dist dist osm_rosdn_dynpac.egg-info osm_rosdn_dynpac*.tar.gz' + python3 setup.py --command-packages=stdeb.command sdist_dsc + sh -c 'cd deb_dist/osm-rosdn-dynpac*/ && dpkg-buildpackage -rfakeroot -uc -us' +whitelist_externals = sh + +####################################################################################### +[testenv:dist_ro_sdn_floodlight_of] +deps = {[testenv]deps} + -r{toxinidir}/requirements-dist.txt +skip_install = true +changedir = {toxinidir}/RO-SDN-floodlight_openflow +commands = + sh -c 'rm -rf deb_dist dist osm_rosdn_floodlightof.egg-info osm_rosdn_floodlightof*.tar.gz' + python3 setup.py --command-packages=stdeb.command sdist_dsc + sh -c 'cd deb_dist/osm-rosdn-floodlightof*/ && dpkg-buildpackage -rfakeroot -uc -us' +whitelist_externals = sh + +####################################################################################### +[testenv:dist_ro_sdn_ietfl2vpn] +deps = {[testenv]deps} + -r{toxinidir}/requirements-dist.txt +skip_install = true +changedir = {toxinidir}/RO-SDN-ietfl2vpn +commands = + sh -c 'rm -rf deb_dist dist osm_rosdn_ietfl2vpn.egg-info osm_rosdn_ietfl2vpn*.tar.gz' + python3 setup.py --command-packages=stdeb.command sdist_dsc + sh -c 'cd deb_dist/osm-rosdn-ietfl2vpn*/ && dpkg-buildpackage -rfakeroot -uc -us' +whitelist_externals = sh + +####################################################################################### +[testenv:dist_ro_sdn_juniper_contrail] +deps = {[testenv]deps} + -r{toxinidir}/requirements-dist.txt +skip_install = true +changedir = {toxinidir}/RO-SDN-juniper_contrail +commands = + sh -c 'rm -rf deb_dist dist osm_rosdn_juniper_contrail.egg-info osm_rosdn_juniper_contrail*.tar.gz' + python3 setup.py --command-packages=stdeb.command sdist_dsc + sh -c 'cd deb_dist/osm-rosdn-juniper-contrail*/ && dpkg-buildpackage -rfakeroot -uc -us' +whitelist_externals = sh + +####################################################################################### +[testenv:dist_ro_sdn_odl_of] +deps = {[testenv]deps} + -r{toxinidir}/requirements-dist.txt +skip_install = true +changedir = {toxinidir}/RO-SDN-odl_openflow +commands = + sh -c 'rm -rf deb_dist dist osm_rosdn_odlof.egg-info osm_rosdn_odlof*.tar.gz' + python3 setup.py --command-packages=stdeb.command sdist_dsc + sh -c 'cd deb_dist/osm-rosdn-odlof*/ && dpkg-buildpackage -rfakeroot -uc -us' +whitelist_externals = sh + +####################################################################################### +[testenv:dist_ro_sdn_onos_of] +deps = {[testenv]deps} + -r{toxinidir}/requirements-dist.txt +skip_install = true +changedir = {toxinidir}/RO-SDN-onos_openflow +commands = + sh -c 'rm -rf deb_dist dist osm_rosdn_onosof.egg-info osm_rosdn_onosof*.tar.gz' + python3 setup.py --command-packages=stdeb.command sdist_dsc + sh -c 'cd deb_dist/osm-rosdn-onosof*/ && dpkg-buildpackage -rfakeroot -uc -us' +whitelist_externals = sh + +####################################################################################### +[testenv:dist_ro_sdn_onos_vpls] +deps = {[testenv]deps} + -r{toxinidir}/requirements-dist.txt +skip_install = true +changedir = {toxinidir}/RO-SDN-onos_vpls +commands = + sh -c 'rm -rf deb_dist dist osm_rosdn_onos_vpls.egg-info osm_rosdn_onos_vpls*.tar.gz' + python3 setup.py --command-packages=stdeb.command sdist_dsc + sh -c 'cd deb_dist/osm-rosdn-onos-vpls*/ && dpkg-buildpackage -rfakeroot -uc -us' +whitelist_externals = sh + +####################################################################################### +[testenv:dist_ro_vim_aws] +deps = {[testenv]deps} + -r{toxinidir}/requirements-dist.txt +skip_install = true +changedir = {toxinidir}/RO-VIM-aws +commands = + sh -c 'rm -rf deb_dist dist osm_rovim_aws.egg-info osm_rovim_aws*.tar.gz' + python3 setup.py --command-packages=stdeb.command sdist_dsc + sh -c 'cd deb_dist/osm-rovim-aws*/ && dpkg-buildpackage -rfakeroot -uc -us' +whitelist_externals = sh + +####################################################################################### +[testenv:dist_ro_vim_azure] +deps = {[testenv]deps} + -r{toxinidir}/requirements-dist.txt +skip_install = true +changedir = {toxinidir}/RO-VIM-azure +commands = + sh -c 'rm -rf deb_dist dist osm_rovim_azure.egg-info osm_rovim_azure*.tar.gz' + python3 setup.py --command-packages=stdeb.command sdist_dsc + sh -c 'cd deb_dist/osm-rovim-azure*/ && dpkg-buildpackage -rfakeroot -uc -us' +whitelist_externals = sh + +####################################################################################### +[testenv:dist_ro_vim_fos] +deps = {[testenv]deps} + -r{toxinidir}/requirements-dist.txt +skip_install = true +changedir = {toxinidir}/RO-VIM-fos +commands = + sh -c 'rm -rf deb_dist dist osm_rovim_fos.egg-info osm_rovim_fos*.tar.gz' + python3 setup.py --command-packages=stdeb.command sdist_dsc + sh -c 'cd deb_dist/osm-rovim-fos*/ && dpkg-buildpackage -rfakeroot -uc -us' +whitelist_externals = sh + +####################################################################################### +[testenv:dist_ro_vim_opennebula] +deps = {[testenv]deps} + -r{toxinidir}/requirements-dist.txt +skip_install = true +changedir = {toxinidir}/RO-VIM-opennebula +commands = + sh -c 'rm -rf deb_dist dist osm_rovim_opennebula.egg-info osm_rovim_opennebula*.tar.gz' + python3 setup.py --command-packages=stdeb.command sdist_dsc + sh -c 'cd deb_dist/osm-rovim-opennebula*/ && dpkg-buildpackage -rfakeroot -uc -us' +whitelist_externals = sh + +####################################################################################### +[testenv:dist_ro_vim_openstack] +deps = {[testenv]deps} + -r{toxinidir}/requirements-dist.txt +skip_install = true +changedir = {toxinidir}/RO-VIM-openstack +commands = + sh -c 'rm -rf deb_dist dist osm_rovim_openstack.egg-info osm_rovim_openstack*.tar.gz' + python3 setup.py --command-packages=stdeb.command sdist_dsc + sh -c 'cd deb_dist/osm-rovim-openstack*/ && dpkg-buildpackage -rfakeroot -uc -us' +whitelist_externals = sh + +####################################################################################### +[testenv:dist_ro_vim_openvim] +deps = {[testenv]deps} + -r{toxinidir}/requirements-dist.txt +skip_install = true +changedir = {toxinidir}/RO-VIM-openvim +commands = + sh -c 'rm -rf deb_dist dist osm_rovim_openvim.egg-info osm_rovim_openvim*.tar.gz' + python3 setup.py --command-packages=stdeb.command sdist_dsc + sh -c 'cd deb_dist/osm-rovim-openvim*/ && dpkg-buildpackage -rfakeroot -uc -us' +whitelist_externals = sh + +####################################################################################### +[testenv:dist_ro_vim_vmware] +deps = {[testenv]deps} + -r{toxinidir}/requirements-dist.txt +skip_install = true +changedir = {toxinidir}/RO-VIM-vmware +commands = + sh -c 'rm -rf deb_dist dist osm_rovim_vmware.egg-info osm_rovim_vmware*.tar.gz' + python3 setup.py --command-packages=stdeb.command sdist_dsc + sh -c 'cd deb_dist/osm-rovim-vmware*/ && dpkg-buildpackage -rfakeroot -uc -us' +whitelist_externals = sh + +####################################################################################### +[flake8] +ignore = + W291, + W293, + W503, + W605, + E123, + E125, + E203, + E226, + E241 +exclude = + .git, + __pycache__, + .tox, +max-line-length = 120 +show-source = True +builtins = _