From: tierno Date: Thu, 2 Jul 2020 06:04:57 +0000 (+0000) Subject: change dependencies to v8.0 branch X-Git-Tag: v8.0.0rc2~1 X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F64%2F9264%2F2;p=osm%2FRO.git change dependencies to v8.0 branch Change-Id: I905bffd1e00bdd86c71e239b126a8bd9580cac2d Signed-off-by: tierno --- diff --git a/RO-SDN-arista_cloudvision/requirements.txt b/RO-SDN-arista_cloudvision/requirements.txt index a4ac97e9..5b4664e8 100644 --- a/RO-SDN-arista_cloudvision/requirements.txt +++ b/RO-SDN-arista_cloudvision/requirements.txt @@ -16,4 +16,4 @@ requests uuid cvprac -git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin +git+https://osm.etsi.org/gerrit/osm/RO.git@v8.0#egg=osm-ro-plugin&subdirectory=RO-plugin diff --git a/RO-SDN-arista_cloudvision/setup.py b/RO-SDN-arista_cloudvision/setup.py index 33bd29fd..8ac35121 100644 --- a/RO-SDN-arista_cloudvision/setup.py +++ b/RO-SDN-arista_cloudvision/setup.py @@ -48,7 +48,7 @@ setup( "requests", "uuid", "cvprac", - "osm-ro-plugin @ git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin" + "osm-ro-plugin @ git+https://osm.etsi.org/gerrit/osm/RO.git@v8.0#egg=osm-ro-plugin&subdirectory=RO-plugin" ], setup_requires=['setuptools-version-command'], entry_points={ diff --git a/RO-SDN-dpb/requirements.txt b/RO-SDN-dpb/requirements.txt index 354756f6..d507f42e 100644 --- a/RO-SDN-dpb/requirements.txt +++ b/RO-SDN-dpb/requirements.txt @@ -15,6 +15,6 @@ paramiko requests -git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin +git+https://osm.etsi.org/gerrit/osm/RO.git@v8.0#egg=osm-ro-plugin&subdirectory=RO-plugin diff --git a/RO-SDN-dpb/setup.py b/RO-SDN-dpb/setup.py index a1b31d7a..a0ae327d 100644 --- a/RO-SDN-dpb/setup.py +++ b/RO-SDN-dpb/setup.py @@ -47,7 +47,7 @@ setup( install_requires=[ "paramiko", "requests", - "osm-ro-plugin @ git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin", + "osm-ro-plugin @ git+https://osm.etsi.org/gerrit/osm/RO.git@v8.0#egg=osm-ro-plugin&subdirectory=RO-plugin", ], setup_requires=['setuptools-version-command'], entry_points={ diff --git a/RO-SDN-dynpac/requirements.txt b/RO-SDN-dynpac/requirements.txt index 0a169e4e..d7d0fb11 100644 --- a/RO-SDN-dynpac/requirements.txt +++ b/RO-SDN-dynpac/requirements.txt @@ -14,4 +14,4 @@ ## requests -osm-ro-plugin @ git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin +osm-ro-plugin @ git+https://osm.etsi.org/gerrit/osm/RO.git@v8.0#egg=osm-ro-plugin&subdirectory=RO-plugin diff --git a/RO-SDN-dynpac/setup.py b/RO-SDN-dynpac/setup.py index a1c7c718..d324578e 100644 --- a/RO-SDN-dynpac/setup.py +++ b/RO-SDN-dynpac/setup.py @@ -46,7 +46,7 @@ setup( 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" + "osm-ro-plugin @ git+https://osm.etsi.org/gerrit/osm/RO.git@v8.0#egg=osm-ro-plugin&subdirectory=RO-plugin" ], setup_requires=['setuptools-version-command'], entry_points={ diff --git a/RO-SDN-floodlight_openflow/requirements.txt b/RO-SDN-floodlight_openflow/requirements.txt index 37366789..d2f24bca 100644 --- a/RO-SDN-floodlight_openflow/requirements.txt +++ b/RO-SDN-floodlight_openflow/requirements.txt @@ -14,4 +14,4 @@ ## requests -git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin +git+https://osm.etsi.org/gerrit/osm/RO.git@v8.0#egg=osm-ro-plugin&subdirectory=RO-plugin diff --git a/RO-SDN-floodlight_openflow/setup.py b/RO-SDN-floodlight_openflow/setup.py index faf1ce7b..c7fc9c4a 100644 --- a/RO-SDN-floodlight_openflow/setup.py +++ b/RO-SDN-floodlight_openflow/setup.py @@ -46,7 +46,7 @@ setup( 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" + "osm-ro-plugin @ git+https://osm.etsi.org/gerrit/osm/RO.git@v8.0#egg=osm-ro-plugin&subdirectory=RO-plugin" ], setup_requires=['setuptools-version-command'], entry_points={ diff --git a/RO-SDN-ietfl2vpn/requirements.txt b/RO-SDN-ietfl2vpn/requirements.txt index 37366789..d2f24bca 100644 --- a/RO-SDN-ietfl2vpn/requirements.txt +++ b/RO-SDN-ietfl2vpn/requirements.txt @@ -14,4 +14,4 @@ ## requests -git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin +git+https://osm.etsi.org/gerrit/osm/RO.git@v8.0#egg=osm-ro-plugin&subdirectory=RO-plugin diff --git a/RO-SDN-ietfl2vpn/setup.py b/RO-SDN-ietfl2vpn/setup.py index 4c53d4b6..4e264e6a 100644 --- a/RO-SDN-ietfl2vpn/setup.py +++ b/RO-SDN-ietfl2vpn/setup.py @@ -46,7 +46,7 @@ setup( 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" + "osm-ro-plugin @ git+https://osm.etsi.org/gerrit/osm/RO.git@v8.0#egg=osm-ro-plugin&subdirectory=RO-plugin" ], setup_requires=['setuptools-version-command'], entry_points={ diff --git a/RO-SDN-juniper_contrail/requirements.txt b/RO-SDN-juniper_contrail/requirements.txt index 37366789..d2f24bca 100644 --- a/RO-SDN-juniper_contrail/requirements.txt +++ b/RO-SDN-juniper_contrail/requirements.txt @@ -14,4 +14,4 @@ ## requests -git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin +git+https://osm.etsi.org/gerrit/osm/RO.git@v8.0#egg=osm-ro-plugin&subdirectory=RO-plugin diff --git a/RO-SDN-juniper_contrail/setup.py b/RO-SDN-juniper_contrail/setup.py index fef59051..452ca845 100644 --- a/RO-SDN-juniper_contrail/setup.py +++ b/RO-SDN-juniper_contrail/setup.py @@ -47,7 +47,7 @@ setup( #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" + "osm-ro-plugin @ git+https://osm.etsi.org/gerrit/osm/RO.git@v8.0#egg=osm-ro-plugin&subdirectory=RO-plugin" ], setup_requires=['setuptools-version-command'], entry_points={ diff --git a/RO-SDN-odl_openflow/requirements.txt b/RO-SDN-odl_openflow/requirements.txt index 37366789..d2f24bca 100644 --- a/RO-SDN-odl_openflow/requirements.txt +++ b/RO-SDN-odl_openflow/requirements.txt @@ -14,4 +14,4 @@ ## requests -git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin +git+https://osm.etsi.org/gerrit/osm/RO.git@v8.0#egg=osm-ro-plugin&subdirectory=RO-plugin diff --git a/RO-SDN-odl_openflow/setup.py b/RO-SDN-odl_openflow/setup.py index 32ebde10..1e2a2ab2 100644 --- a/RO-SDN-odl_openflow/setup.py +++ b/RO-SDN-odl_openflow/setup.py @@ -46,7 +46,7 @@ setup( 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" + "osm-ro-plugin @ git+https://osm.etsi.org/gerrit/osm/RO.git@v8.0#egg=osm-ro-plugin&subdirectory=RO-plugin" ], setup_requires=['setuptools-version-command'], entry_points={ diff --git a/RO-SDN-onos_openflow/requirements.txt b/RO-SDN-onos_openflow/requirements.txt index 37366789..d2f24bca 100644 --- a/RO-SDN-onos_openflow/requirements.txt +++ b/RO-SDN-onos_openflow/requirements.txt @@ -14,4 +14,4 @@ ## requests -git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin +git+https://osm.etsi.org/gerrit/osm/RO.git@v8.0#egg=osm-ro-plugin&subdirectory=RO-plugin diff --git a/RO-SDN-onos_openflow/setup.py b/RO-SDN-onos_openflow/setup.py index 66427b2b..770f27c7 100644 --- a/RO-SDN-onos_openflow/setup.py +++ b/RO-SDN-onos_openflow/setup.py @@ -46,7 +46,7 @@ setup( 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" + "osm-ro-plugin @ git+https://osm.etsi.org/gerrit/osm/RO.git@v8.0#egg=osm-ro-plugin&subdirectory=RO-plugin" ], setup_requires=['setuptools-version-command'], entry_points={ diff --git a/RO-SDN-onos_vpls/requirements.txt b/RO-SDN-onos_vpls/requirements.txt index 37366789..d2f24bca 100644 --- a/RO-SDN-onos_vpls/requirements.txt +++ b/RO-SDN-onos_vpls/requirements.txt @@ -14,4 +14,4 @@ ## requests -git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin +git+https://osm.etsi.org/gerrit/osm/RO.git@v8.0#egg=osm-ro-plugin&subdirectory=RO-plugin diff --git a/RO-SDN-onos_vpls/setup.py b/RO-SDN-onos_vpls/setup.py index 562954b7..3c1c200b 100644 --- a/RO-SDN-onos_vpls/setup.py +++ b/RO-SDN-onos_vpls/setup.py @@ -46,7 +46,7 @@ setup( 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" + "osm-ro-plugin @ git+https://osm.etsi.org/gerrit/osm/RO.git@v8.0#egg=osm-ro-plugin&subdirectory=RO-plugin" ], setup_requires=['setuptools-version-command'], entry_points={ diff --git a/RO-VIM-aws/requirements.txt b/RO-VIM-aws/requirements.txt index 689089e9..10a6cd53 100644 --- a/RO-VIM-aws/requirements.txt +++ b/RO-VIM-aws/requirements.txt @@ -17,4 +17,4 @@ PyYAML requests netaddr boto -git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin +git+https://osm.etsi.org/gerrit/osm/RO.git@v8.0#egg=osm-ro-plugin&subdirectory=RO-plugin diff --git a/RO-VIM-aws/setup.py b/RO-VIM-aws/setup.py index 12de7053..7ff84a19 100644 --- a/RO-VIM-aws/setup.py +++ b/RO-VIM-aws/setup.py @@ -46,7 +46,7 @@ setup( 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" + "osm-ro-plugin @ git+https://osm.etsi.org/gerrit/osm/RO.git@v8.0#egg=osm-ro-plugin&subdirectory=RO-plugin" ], setup_requires=['setuptools-version-command'], entry_points={ diff --git a/RO-VIM-azure/requirements.txt b/RO-VIM-azure/requirements.txt index 88e2fcae..abb9d193 100644 --- a/RO-VIM-azure/requirements.txt +++ b/RO-VIM-azure/requirements.txt @@ -17,4 +17,4 @@ PyYAML requests netaddr azure==4.0.0 -git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin +git+https://osm.etsi.org/gerrit/osm/RO.git@v8.0#egg=osm-ro-plugin&subdirectory=RO-plugin diff --git a/RO-VIM-azure/setup.py b/RO-VIM-azure/setup.py index 9debdd07..32257051 100644 --- a/RO-VIM-azure/setup.py +++ b/RO-VIM-azure/setup.py @@ -49,7 +49,7 @@ setup( "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" + "osm-ro-plugin @ git+https://osm.etsi.org/gerrit/osm/RO.git@v8.0#egg=osm-ro-plugin&subdirectory=RO-plugin" ], setup_requires=['setuptools-version-command'], entry_points={ diff --git a/RO-VIM-fos/requirements.txt b/RO-VIM-fos/requirements.txt index 2bded1b9..f47f6868 100644 --- a/RO-VIM-fos/requirements.txt +++ b/RO-VIM-fos/requirements.txt @@ -22,4 +22,4 @@ 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 +git+https://osm.etsi.org/gerrit/osm/RO.git@v8.0#egg=osm-ro-plugin&subdirectory=RO-plugin diff --git a/RO-VIM-fos/setup.py b/RO-VIM-fos/setup.py index 93935664..55ce3320 100644 --- a/RO-VIM-fos/setup.py +++ b/RO-VIM-fos/setup.py @@ -54,7 +54,7 @@ setup( "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" + "osm-ro-plugin @ git+https://osm.etsi.org/gerrit/osm/RO.git@v8.0#egg=osm-ro-plugin&subdirectory=RO-plugin" ], setup_requires=['setuptools-version-command'], entry_points={ diff --git a/RO-VIM-opennebula/requirements.txt b/RO-VIM-opennebula/requirements.txt index 6db93ce9..6bc51c61 100644 --- a/RO-VIM-opennebula/requirements.txt +++ b/RO-VIM-opennebula/requirements.txt @@ -20,4 +20,4 @@ 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 +git+https://osm.etsi.org/gerrit/osm/RO.git@v8.0#egg=osm-ro-plugin&subdirectory=RO-plugin diff --git a/RO-VIM-opennebula/setup.py b/RO-VIM-opennebula/setup.py index 4b3ec179..f55be20f 100644 --- a/RO-VIM-opennebula/setup.py +++ b/RO-VIM-opennebula/setup.py @@ -49,7 +49,7 @@ setup( "requests", "netaddr", "PyYAML", - "osm-ro-plugin @ git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin" + "osm-ro-plugin @ git+https://osm.etsi.org/gerrit/osm/RO.git@v8.0#egg=osm-ro-plugin&subdirectory=RO-plugin" ], setup_requires=['setuptools-version-command'], entry_points={ diff --git a/RO-VIM-openstack/requirements.txt b/RO-VIM-openstack/requirements.txt index 2a4b69e7..9570c8b0 100644 --- a/RO-VIM-openstack/requirements.txt +++ b/RO-VIM-openstack/requirements.txt @@ -23,4 +23,4 @@ netaddr #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 +git+https://osm.etsi.org/gerrit/osm/RO.git@v8.0#egg=osm-ro-plugin&subdirectory=RO-plugin diff --git a/RO-VIM-openstack/setup.py b/RO-VIM-openstack/setup.py index 8c3b1eee..2df769de 100644 --- a/RO-VIM-openstack/setup.py +++ b/RO-VIM-openstack/setup.py @@ -47,7 +47,7 @@ setup( 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" + "osm-ro-plugin @ git+https://osm.etsi.org/gerrit/osm/RO.git@v8.0#egg=osm-ro-plugin&subdirectory=RO-plugin" # TODO py3 "networking-l2gw" # "python-novaclient", "python-keystoneclient", "python-glanceclient", "python-cinderclient", ], diff --git a/RO-VIM-openvim/requirements.txt b/RO-VIM-openvim/requirements.txt index 5802df5b..0d618407 100644 --- a/RO-VIM-openvim/requirements.txt +++ b/RO-VIM-openvim/requirements.txt @@ -16,4 +16,4 @@ PyYAML requests netaddr -git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin +git+https://osm.etsi.org/gerrit/osm/RO.git@v8.0#egg=osm-ro-plugin&subdirectory=RO-plugin diff --git a/RO-VIM-openvim/setup.py b/RO-VIM-openvim/setup.py index ab995772..3f024b4d 100644 --- a/RO-VIM-openvim/setup.py +++ b/RO-VIM-openvim/setup.py @@ -46,7 +46,7 @@ setup( 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" + "osm-ro-plugin @ git+https://osm.etsi.org/gerrit/osm/RO.git@v8.0#egg=osm-ro-plugin&subdirectory=RO-plugin" ], setup_requires=['setuptools-version-command'], entry_points={ diff --git a/RO-VIM-vmware/requirements.txt b/RO-VIM-vmware/requirements.txt index 16573675..8e6fafaf 100644 --- a/RO-VIM-vmware/requirements.txt +++ b/RO-VIM-vmware/requirements.txt @@ -22,4 +22,4 @@ pyvmomi progressbar prettytable # TODO py3 genisoimage -git+https://osm.etsi.org/gerrit/osm/RO.git#egg=osm-ro-plugin&subdirectory=RO-plugin +git+https://osm.etsi.org/gerrit/osm/RO.git@v8.0#egg=osm-ro-plugin&subdirectory=RO-plugin diff --git a/RO-VIM-vmware/setup.py b/RO-VIM-vmware/setup.py index 46594a6e..bd3aebee 100644 --- a/RO-VIM-vmware/setup.py +++ b/RO-VIM-vmware/setup.py @@ -48,7 +48,7 @@ setup( 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" + "osm-ro-plugin @ git+https://osm.etsi.org/gerrit/osm/RO.git@v8.0#egg=osm-ro-plugin&subdirectory=RO-plugin" ], setup_requires=['setuptools-version-command'], entry_points={ diff --git a/RO/osm_ro/openmanod.py b/RO/osm_ro/openmanod.py index 93aca893..ea47b23f 100755 --- a/RO/osm_ro/openmanod.py +++ b/RO/osm_ro/openmanod.py @@ -53,8 +53,8 @@ import osm_ro __author__ = "Alfonso Tierno, Gerardo Garcia, Pablo Montes" __date__ = "$26-aug-2014 11:09:29$" -__version__ = "7.0.1.post26" -version_date = "May 2020" +__version__ = "8.0.0.post1" +version_date = "Jul 2020" database_version = 40 # expected database schema version global global_config diff --git a/RO/requirements.txt b/RO/requirements.txt index edb517d5..0014a456 100644 --- a/RO/requirements.txt +++ b/RO/requirements.txt @@ -20,4 +20,4 @@ paramiko requests==2.18.* netaddr logutils -osm-im @ git+https://osm.etsi.org/gerrit/osm/IM.git#egg=osm-im +osm-im @ git+https://osm.etsi.org/gerrit/osm/IM.git@v8.0#egg=osm-im diff --git a/RO/setup.py b/RO/setup.py index 4bd22232..961d53d3 100755 --- a/RO/setup.py +++ b/RO/setup.py @@ -28,16 +28,14 @@ _maintainer_email = 'gerardo.garciadeblas@telefonica.com' _license = 'Apache 2.0' _url = 'https://osm.etsi.org/gitweb/?p=osm/RO.git;a=summary' _requirements = [ - # TODO py3 revise - "osm-im @ git+https://osm.etsi.org/gerrit/osm/IM.git#egg=osm-im", + "osm-im @ git+https://osm.etsi.org/gerrit/osm/IM.git@v8.0#egg=osm-im", "PyYAML", "bottle", "logutils", "jsonschema", "paramiko", "mysqlclient", - #"MySQLdb", - + # "MySQLdb", # common to VIMS "requests", "netaddr", # openstack, aws, vmware