From 949e05307d162826f2d4b9325758f3f232724458 Mon Sep 17 00:00:00 2001 From: Benjamin Diaz Date: Mon, 9 Dec 2019 20:12:42 -0300 Subject: [PATCH] Adds onos_vpls to install in Dockerfile-local Change-Id: Iee9869ecd53cf3daef76cd3c693e92cb7a60c5d2 Signed-off-by: Benjamin Diaz --- Dockerfile-local | 1 + RO-SDN-onos_vpls/Makefile | 4 ++-- .../sdn_assist_onos_vpls.py | 0 RO-SDN-onos_vpls/setup.py | 4 ++-- RO-SDN-onos_vpls/tox.ini | 4 ++-- 5 files changed, 7 insertions(+), 6 deletions(-) rename RO-SDN-onos_vpls/{osm_rosdn_onosvpls => osm_rosdn_onos_vpls}/sdn_assist_onos_vpls.py (100%) diff --git a/Dockerfile-local b/Dockerfile-local index 5ad7b4ba..3c9540e5 100644 --- a/Dockerfile-local +++ b/Dockerfile-local @@ -56,6 +56,7 @@ RUN /root/RO/RO/osm_ro/scripts/install-osm-im.sh --develop && \ 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-tapi && \ + python3 -m pip install -e /root/RO/RO-SDN-onos_vpls && \ rm -rf /root/.cache && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* diff --git a/RO-SDN-onos_vpls/Makefile b/RO-SDN-onos_vpls/Makefile index b2f4d85e..952d6ef8 100644 --- a/RO-SDN-onos_vpls/Makefile +++ b/RO-SDN-onos_vpls/Makefile @@ -16,9 +16,9 @@ all: clean package clean: - rm -rf dist deb_dist osm_rosdn_onosvpls-*.tar.gz osm_rosdn_tapi.egg-info .eggs + 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-onosvpls*/ && dpkg-buildpackage -rfakeroot -uc -us + cd deb_dist/osm-rosdn-onos-vpls*/ && dpkg-buildpackage -rfakeroot -uc -us diff --git a/RO-SDN-onos_vpls/osm_rosdn_onosvpls/sdn_assist_onos_vpls.py b/RO-SDN-onos_vpls/osm_rosdn_onos_vpls/sdn_assist_onos_vpls.py similarity index 100% rename from RO-SDN-onos_vpls/osm_rosdn_onosvpls/sdn_assist_onos_vpls.py rename to RO-SDN-onos_vpls/osm_rosdn_onos_vpls/sdn_assist_onos_vpls.py diff --git a/RO-SDN-onos_vpls/setup.py b/RO-SDN-onos_vpls/setup.py index 83630d40..0785cb5b 100644 --- a/RO-SDN-onos_vpls/setup.py +++ b/RO-SDN-onos_vpls/setup.py @@ -22,7 +22,7 @@ _name = "osm_rosdn_onos_vpls" README = """ =========== -osm-rosdn_onosvpls +osm-rosdn_onos_vpls =========== osm-ro pluging for ONOS VPLS SDN @@ -48,6 +48,6 @@ setup( install_requires=["requests", "osm-ro"], setup_requires=['setuptools-version-command'], entry_points={ - 'osm_rosdn.plugins': ['rosdn_onosvpls = osm_rosdn_onosvpls.sdn_assist_onos_vpls:OnosVpls'], + 'osm_rosdn.plugins': ['rosdn_onos_vpls = osm_rosdn_onos_vpls.sdn_assist_onos_vpls:OnosVpls'], }, ) diff --git a/RO-SDN-onos_vpls/tox.ini b/RO-SDN-onos_vpls/tox.ini index 00ac655e..e72bc162 100644 --- a/RO-SDN-onos_vpls/tox.ini +++ b/RO-SDN-onos_vpls/tox.ini @@ -26,12 +26,12 @@ commands=python3 -m unittest discover -v [testenv:flake8] basepython = python3 deps = flake8 -commands = flake8 osm_rosdn_onosvpls --max-line-length 120 \ +commands = flake8 osm_rosdn_onos_vpls --max-line-length 120 \ --exclude .svn,CVS,.gz,.git,__pycache__,.tox,local,temp --ignore W291,W293,E226,W504 [testenv:unittest] basepython = python3 -commands = python3 -m unittest osm_rosdn_onosvpls.tests +commands = python3 -m unittest osm_rosdn_onos_vpls.tests [testenv:build] basepython = python3 -- 2.25.1