fix dependencies at setup.py

Change-Id: I338003728206b3934c07835e2f7a01a76ed1eda5
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>

diff --git a/RO-SDN-dynpac/requirements.txt b/RO-SDN-dynpac/requirements.txt
index 44c797f..a6f6d65 100644 (file)
--- a/RO-SDN-dynpac/requirements.txt
+++ b/RO-SDN-dynpac/requirements.txt
@@ -14,5 +14,5 @@
 ##
 
 requests
-git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro
+git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro&subdirectory=RO
 

diff --git a/RO-SDN-dynpac/setup.py b/RO-SDN-dynpac/setup.py
index 52a4fc8..af69a0d 100644 (file)
--- a/RO-SDN-dynpac/setup.py
+++ b/RO-SDN-dynpac/setup.py
@@ -44,8 +44,10 @@ setup(
 
     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"],
+    install_requires=[
+        "requests",
+        "osm-ro @ git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro&subdirectory=RO"
+    ],
     setup_requires=['setuptools-version-command'],
     entry_points={
         'osm_rosdn.plugins': ['rosdn_dynpac = osm_rosdn_dynpac.wimconn_dynpac:DynpacConnector'],

diff --git a/RO-SDN-floodlight_openflow/setup.py b/RO-SDN-floodlight_openflow/setup.py
index 93a1988..d5b9848 100644 (file)
--- a/RO-SDN-floodlight_openflow/setup.py
+++ b/RO-SDN-floodlight_openflow/setup.py
@@ -44,8 +44,10 @@ setup(
 
     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"],
+    install_requires=[
+        "requests",
+        "osm-ro @ git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro&subdirectory=RO"
+    ],
     setup_requires=['setuptools-version-command'],
     entry_points={
         'osm_rosdn.plugins': ['rosdn_floodlightof = osm_rosdn_floodlightof.sdnconn_floodlightof:'

diff --git a/RO-SDN-onos_openflow/requirements.txt b/RO-SDN-onos_openflow/requirements.txt
index 44c797f..a6f6d65 100644 (file)
--- a/RO-SDN-onos_openflow/requirements.txt
+++ b/RO-SDN-onos_openflow/requirements.txt
@@ -14,5 +14,5 @@
 ##
 
 requests
-git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro
+git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro&subdirectory=RO
 

diff --git a/RO-SDN-onos_openflow/setup.py b/RO-SDN-onos_openflow/setup.py
index 333ee58..96e6b62 100644 (file)
--- a/RO-SDN-onos_openflow/setup.py
+++ b/RO-SDN-onos_openflow/setup.py
@@ -44,8 +44,10 @@ setup(
 
     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"],
+    install_requires=[
+        "requests",
+        "osm-ro @ git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro&subdirectory=RO"
+    ],
     setup_requires=['setuptools-version-command'],
     entry_points={
         'osm_rosdn.plugins': ['rosdn_onosof = osm_rosdn_onosof.sdnconn_onosof:SdnConnectorOnosOf'],

diff --git a/RO-SDN-onos_openflow/tox.ini b/RO-SDN-onos_openflow/tox.ini
index 00b4585..a9f8688 100644 (file)
--- a/RO-SDN-onos_openflow/tox.ini
+++ b/RO-SDN-onos_openflow/tox.ini
@@ -14,18 +14,20 @@
 ##
 
 [tox]
-envlist = py3
-toxworkdir={homedir}/.tox
+envlist = flake8
+toxworkdir={toxinidir}/.tox
 
 [testenv]
 basepython = python3
-install_command = python3 -m pip install -r requirements.txt -U {opts} {packages}
+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,E226,W504
 

diff --git a/RO-SDN-onos_vpls/requirements.txt b/RO-SDN-onos_vpls/requirements.txt
index 44c797f..a6f6d65 100644 (file)
--- a/RO-SDN-onos_vpls/requirements.txt
+++ b/RO-SDN-onos_vpls/requirements.txt
@@ -14,5 +14,5 @@
 ##
 
 requests
-git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro
+git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro&subdirectory=RO
 

diff --git a/RO-SDN-onos_vpls/setup.py b/RO-SDN-onos_vpls/setup.py
index 0785cb5..b015e67 100644 (file)
--- a/RO-SDN-onos_vpls/setup.py
+++ b/RO-SDN-onos_vpls/setup.py
@@ -44,8 +44,10 @@ setup(
 
     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"],
+    install_requires=[
+        "requests",
+        "osm-ro @ git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro&subdirectory=RO"
+    ],
     setup_requires=['setuptools-version-command'],
     entry_points={
         'osm_rosdn.plugins': ['rosdn_onos_vpls = osm_rosdn_onos_vpls.sdn_assist_onos_vpls:OnosVpls'],

diff --git a/RO-SDN-tapi/requirements.txt b/RO-SDN-tapi/requirements.txt
index 44c797f..a6f6d65 100644 (file)
--- a/RO-SDN-tapi/requirements.txt
+++ b/RO-SDN-tapi/requirements.txt
@@ -14,5 +14,5 @@
 ##
 
 requests
-git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro
+git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro&subdirectory=RO
 

diff --git a/RO-SDN-tapi/setup.py b/RO-SDN-tapi/setup.py
index 931dd66..9217492 100644 (file)
--- a/RO-SDN-tapi/setup.py
+++ b/RO-SDN-tapi/setup.py
@@ -45,7 +45,10 @@ setup(
     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"],
+    install_requires=[
+        "requests",
+        "osm-ro @ git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro&subdirectory=RO"
+    ],
     setup_requires=['setuptools-version-command'],
     entry_points={
         'osm_rosdn.plugins': ['rosdn_tapi = osm_rosdn_tapi.wimconn_ietfl2vpn:WimconnectorIETFL2VPN'],

diff --git a/RO-VIM-aws/setup.py b/RO-VIM-aws/setup.py
index 30b90bd..b8f3703 100644 (file)
--- a/RO-VIM-aws/setup.py
+++ b/RO-VIM-aws/setup.py
@@ -44,9 +44,9 @@ setup(
 
     packages=[_name],
     include_package_data=True,
-    dependency_links=["git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro"],
     install_requires=[
-        "requests", "netaddr", "PyYAML", "osm-ro", "boto"
+        "requests", "netaddr", "PyYAML", "boto",
+        "osm-ro @ git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro&subdirectory=RO"
     ],
     setup_requires=['setuptools-version-command'],
     entry_points={

diff --git a/RO-VIM-azure/setup.py b/RO-VIM-azure/setup.py
index 557feda..32c204c 100644 (file)
--- a/RO-VIM-azure/setup.py
+++ b/RO-VIM-azure/setup.py
@@ -44,8 +44,13 @@ setup(
 
     packages=[_name],
     include_package_data=True,
-    dependency_links=["git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro"],
-    install_requires=["requests", "netaddr", "PyYAML", "azure", "osm-ro"],
+    install_requires=[
+        "requests",
+        "netaddr",
+        "PyYAML",
+        "azure",
+        "osm-ro @ git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro&subdirectory=RO"
+    ],
     setup_requires=['setuptools-version-command'],
     entry_points={
         'osm_rovim.plugins': ['rovim_azure = osm_rovim_azure.vimconn_azure'],

diff --git a/RO-VIM-fos/setup.py b/RO-VIM-fos/setup.py
index 95d97ca..62cf4b8 100644 (file)
--- a/RO-VIM-fos/setup.py
+++ b/RO-VIM-fos/setup.py
@@ -44,9 +44,12 @@ setup(
 
     packages=[_name],
     include_package_data=True,
-    dependency_links=["git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro"],
     install_requires=[
-        "requests", "netaddr", "PyYAML", "osm-ro", "fog05rest>=0.0.4"
+        "requests",
+        "netaddr",
+        "PyYAML",
+        "fog05rest>=0.0.4",
+        "osm-ro @ git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro&subdirectory=RO"
     ],
     setup_requires=['setuptools-version-command'],
     entry_points={

diff --git a/RO-VIM-opennebula/setup.py b/RO-VIM-opennebula/setup.py
index c27bca3..7819282 100644 (file)
--- a/RO-VIM-opennebula/setup.py
+++ b/RO-VIM-opennebula/setup.py
@@ -45,8 +45,12 @@ setup(
 
     packages=[_name],
     include_package_data=True,
-    dependency_links=["git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro"],
-    install_requires=["requests", "netaddr", "PyYAML", "osm-ro",],
+    install_requires=[
+        "requests",
+        "netaddr",
+        "PyYAML",
+        "osm-ro @ git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro&subdirectory=RO"
+    ],
     setup_requires=['setuptools-version-command'],
     entry_points={
         'osm_rovim.plugins': ['rovim_opennebula = osm_rovim_opennebula.vimconn_opennebula'],

diff --git a/RO-VIM-openstack/setup.py b/RO-VIM-openstack/setup.py
index 1b3deba..56c798b 100644 (file)
--- a/RO-VIM-openstack/setup.py
+++ b/RO-VIM-openstack/setup.py
@@ -44,11 +44,11 @@ setup(
 
     packages=[_name],
     include_package_data=True,
-    dependency_links=["git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro"],
     install_requires=[
         "python-openstackclient", "python-neutronclient", 
         "requests", "netaddr", "PyYAML",
-        "osm-ro", # TODO py3 "networking-l2gw"
+        "osm-ro @ git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro&subdirectory=RO"
+        # TODO py3 "networking-l2gw"
         # "python-novaclient", "python-keystoneclient", "python-glanceclient", "python-cinderclient",
     ],
     setup_requires=['setuptools-version-command'],

diff --git a/RO-VIM-openvim/setup.py b/RO-VIM-openvim/setup.py
index 19ac0ba..7a9070c 100644 (file)
--- a/RO-VIM-openvim/setup.py
+++ b/RO-VIM-openvim/setup.py
@@ -44,9 +44,9 @@ setup(
 
     packages=[_name],
     include_package_data=True,
-    dependency_links=["git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro"],
     install_requires=[
         "requests", "netaddr", "PyYAML",
+        "osm-ro @ git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro&subdirectory=RO"
     ],
     setup_requires=['setuptools-version-command'],
     entry_points={

diff --git a/RO-VIM-vmware/setup.py b/RO-VIM-vmware/setup.py
index 193102e..373cf81 100644 (file)
--- a/RO-VIM-vmware/setup.py
+++ b/RO-VIM-vmware/setup.py
@@ -45,11 +45,10 @@ setup(
 
     packages=[_name],
     include_package_data=True,
-    dependency_links=["git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro"],
     install_requires=[
         "pyvcloud==19.1.1", "progressbar", "prettytable", "pyvmomi",
         "requests", "netaddr", "PyYAML",
-        "osm-ro",
+        "osm-ro @ git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro&subdirectory=RO"
     ],
     setup_requires=['setuptools-version-command'],
     entry_points={

diff --git a/RO/setup.py b/RO/setup.py
index 5cb1fe9..a78a18b 100755 (executable)
--- a/RO/setup.py
+++ b/RO/setup.py
@@ -29,7 +29,7 @@ _license = 'Apache 2.0'
 _url = 'https://osm.etsi.org/gitweb/?p=osm/RO.git;a=summary'
 _requirements = [
     # TODO py3 revise
-    "osm-im",
+    "osm-im @ git+https://osm.etsi.org/gerrit/osm/IM.git#egg=osm-im",
     "PyYAML",
     "bottle",
     "logutils",
@@ -67,7 +67,7 @@ setup(
     scripts=['osm_ro/scripts/RO-start.sh'
       #'openmanod', 'openmano', 'osm_ro/scripts/service-openmano', 'osm_ro/scripts/openmano-report',
       ],
-    dependency_links=["git+https://osm.etsi.org/gerrit/osm/IM.git#egg=osm-im"],
+    # dependency_links=["git+https://osm.etsi.org/gerrit/osm/IM.git#egg=osm_im"],
     install_requires=_requirements,
     include_package_data=True,
     setup_requires=['setuptools-version-command'],