From: sousaedu Date: Mon, 29 Nov 2021 09:28:15 +0000 (+0000) Subject: Fix bug 1810 - Disabling RO OpenNebula plugin X-Git-Tag: v10.1.0-rc1~12 X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FRO.git;a=commitdiff_plain;h=2e3500bec7f5a901c527d52ecefe930f21cebfdc Fix bug 1810 - Disabling RO OpenNebula plugin Change-Id: I52a7947450d83b91fac92170348f7d474a878d97 Signed-off-by: sousaedu --- diff --git a/RO-VIM-azure/osm_rovim_azure/vimconn_azure.py b/RO-VIM-azure/osm_rovim_azure/vimconn_azure.py index a1d3aa82..68f77113 100755 --- a/RO-VIM-azure/osm_rovim_azure/vimconn_azure.py +++ b/RO-VIM-azure/osm_rovim_azure/vimconn_azure.py @@ -548,7 +548,9 @@ class vimconnector(vimconn.VimConnector): self._reload_connection() subnet_id = net["net_id"] - location = self.region or self._get_location_from_resource_group(self.resource_group) + location = self.region or self._get_location_from_resource_group( + self.resource_group + ) try: net_ifz = {"location": location} net_ip_config = { diff --git a/devops-stages/stage-build.sh b/devops-stages/stage-build.sh index 4ece8af7..e0af70f8 100755 --- a/devops-stages/stage-build.sh +++ b/devops-stages/stage-build.sh @@ -32,7 +32,7 @@ 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_opennebula & tox -e dist_ro_vim_openstack & tox -e dist_ro_vim_openvim & tox -e dist_ro_vim_vmware & @@ -54,7 +54,9 @@ 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 - cp ${vim_plugin}/deb_dist/python3-osm-rovim*.deb deb_dist/ + if [ "$vim_plugin" != "RO-VIM-opennebula" ]; then + cp ${vim_plugin}/deb_dist/python3-osm-rovim*.deb deb_dist/ + fi done # SDN plugins: DynPac, Ietfl2vpn, Onosof Floodlightof @@ -62,4 +64,3 @@ for sdn_plugin in RO-SDN-* do cp ${sdn_plugin}/deb_dist/python3-osm-rosdn*.deb deb_dist/ done - diff --git a/releasenotes/notes/fix_bug_1810-b2bc23440751b829.yaml b/releasenotes/notes/fix_bug_1810-b2bc23440751b829.yaml new file mode 100644 index 00000000..998f44f7 --- /dev/null +++ b/releasenotes/notes/fix_bug_1810-b2bc23440751b829.yaml @@ -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. +####################################################################################### +--- +fixes: + - | + Disabling the Open Nebula plugin because it has a dependency to a GPLv2 licensed + library. Due to licensing restrictions and has mentioned in bug 1810, this cannot be + happen, therefore the plugin will remain disabled until further notice. diff --git a/requirements-dist.txt b/requirements-dist.txt index b32a04ab..77debcf8 100644 --- a/requirements-dist.txt +++ b/requirements-dist.txt @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. ####################################################################################### -setuptools-version-command==2.2 +setuptools-version-command==99.9 # via -r requirements-dist.in stdeb==0.10.0 # via -r requirements-dist.in diff --git a/requirements-test.txt b/requirements-test.txt index 7b16cb5e..f461166d 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -16,7 +16,7 @@ ####################################################################################### -e RO-plugin # via -r requirements-test.in -coverage==5.5 +coverage==6.2 # via # -r requirements-test.in # nose2 diff --git a/requirements.in b/requirements.in index a2d1d5e7..06182df9 100644 --- a/requirements.in +++ b/requirements.in @@ -28,7 +28,9 @@ -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-opennebula/requirements.in -r RO-VIM-openstack/requirements.in -r RO-VIM-openvim/requirements.in -r RO-VIM-vmware/requirements.in +portend<3.1.0 +pyyaml==5.4.1 diff --git a/requirements.txt b/requirements.txt index 251e6b76..21a55798 100644 --- a/requirements.txt +++ b/requirements.txt @@ -16,8 +16,6 @@ ####################################################################################### adal==1.2.7 # via msrestazure -aenum==3.1.0 - # via pyone alabaster==0.7.12 # via sphinx appdirs==1.4.4 @@ -34,56 +32,54 @@ azure-common==1.1.27 # azure-mgmt-compute # azure-mgmt-network # azure-mgmt-resource -azure-core==1.17.0 +azure-core==1.20.1 # via # azure-identity # azure-mgmt-core -azure-identity==1.6.1 +azure-identity==1.7.1 # via -r RO-VIM-azure/requirements.in -azure-mgmt-compute==22.1.0 +azure-mgmt-compute==23.1.0 # via -r RO-VIM-azure/requirements.in azure-mgmt-core==1.3.0 # via # azure-mgmt-compute # azure-mgmt-network # azure-mgmt-resource -azure-mgmt-network==19.0.0 +azure-mgmt-network==19.3.0 # via -r RO-VIM-azure/requirements.in -azure-mgmt-resource==19.0.0 +azure-mgmt-resource==20.0.0 # via -r RO-VIM-azure/requirements.in babel==2.9.1 # via sphinx bcrypt==3.2.0 # via paramiko -bitarray==2.3.2 +bitarray==2.3.4 # via pyangbind boto==2.49.0 # via -r RO-VIM-aws/requirements.in -certifi==2021.5.30 +certifi==2021.10.8 # via # msrest # requests -cffi==1.14.6 +cffi==1.15.0 # via # bcrypt # cryptography # pynacl -charset-normalizer==2.0.4 +charset-normalizer==2.0.8 # via requests cheroot==8.5.2 # via cherrypy cherrypy==18.1.2 # via -r NG-RO/requirements.in -cliff==3.9.0 +cliff==3.10.0 # via # osc-lib # python-neutronclient # python-openstackclient -cmd2==2.1.2 +cmd2==2.3.3 # via cliff -colorama==0.4.4 - # via cmd2 -cryptography==3.4.8 +cryptography==36.0.0 # via # -r NG-RO/requirements.in # adal @@ -95,7 +91,7 @@ cryptography==3.4.8 # pyopenssl cvprac==1.0.7 # via -r RO-SDN-arista_cloudvision/requirements.in -debtcollector==2.2.0 +debtcollector==2.3.0 # via # oslo.config # oslo.context @@ -103,15 +99,13 @@ debtcollector==2.2.0 # oslo.utils # python-keystoneclient # python-neutronclient -decorator==5.0.9 +decorator==5.1.0 # via # dogpile.cache # openstacksdk -dicttoxml==1.7.4 - # via pyone docutils==0.17.1 # via sphinx -dogpile.cache==1.1.3 +dogpile.cache==1.1.4 # via openstacksdk enum34==1.1.10 # via pyangbind @@ -125,15 +119,15 @@ fog05==0.2.0 # via -r RO-VIM-fos/requirements.in hexdump==3.3 # via yaks -humanfriendly==9.2 +humanfriendly==10.0 # via pyvcloud -idna==3.2 +idna==3.3 # via requests -imagesize==1.2.0 +imagesize==1.3.0 # via sphinx -importlib-metadata==4.8.1 +importlib-metadata==4.8.2 # via -r NG-RO/requirements.in -iso8601==0.1.16 +iso8601==1.0.2 # via # keystoneauth1 # openstacksdk @@ -143,11 +137,11 @@ iso8601==0.1.16 # python-openstackclient isodate==0.6.0 # via msrest -jaraco.functools==3.3.0 +jaraco.functools==3.4.0 # via # cheroot # tempora -jinja2==3.0.1 +jinja2==3.0.3 # via sphinx jmespath==0.10.0 # via openstacksdk @@ -155,14 +149,14 @@ jsonpatch==1.32 # via # openstacksdk # warlock -jsonpointer==2.1 +jsonpointer==2.2 # via jsonpatch jsonschema==3.2.0 # via # fog05 # fog05-sdk # warlock -keystoneauth1==4.3.1 +keystoneauth1==4.4.0 # via # openstacksdk # osc-lib @@ -173,26 +167,25 @@ keystoneauth1==4.3.1 # python-novaclient logutils==0.3.5 # via -r NG-RO/requirements.in -lxml==4.6.3 +lxml==4.6.4 # via # pyang # pyangbind - # pyone # pyvcloud markupsafe==2.0.1 # via jinja2 -more-itertools==8.8.0 +more-itertools==8.12.0 # via # cheroot # cherrypy # jaraco.functools msal-extensions==0.3.0 # via azure-identity -msal==1.14.0 +msal==1.16.0 # via # azure-identity # msal-extensions -msgpack==1.0.2 +msgpack==1.0.3 # via oslo.serialization msrest==0.6.21 # via @@ -215,7 +208,6 @@ netaddr==0.8.0 # -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 @@ -228,9 +220,7 @@ netifaces==0.11.0 # oslo.utils oauthlib==3.1.1 # via requests-oauthlib -oca==4.10.0 - # via -r RO-VIM-opennebula/requirements.in -openstacksdk==0.59.0 +openstacksdk==0.60.0 # via # os-client-config # osc-lib @@ -249,9 +239,9 @@ oslo.config==8.7.1 # via # oslo.log # python-keystoneclient -oslo.context==3.3.1 +oslo.context==3.4.0 # via oslo.log -oslo.i18n==5.0.1 +oslo.i18n==5.1.0 # via # osc-lib # oslo.config @@ -263,7 +253,7 @@ oslo.i18n==5.0.1 # python-neutronclient # python-novaclient # python-openstackclient -oslo.log==4.6.0 +oslo.log==4.6.1 # via python-neutronclient oslo.serialization==4.2.0 # via @@ -271,7 +261,7 @@ oslo.serialization==4.2.0 # python-keystoneclient # python-neutronclient # python-novaclient -oslo.utils==4.10.0 +oslo.utils==4.12.0 # via # osc-lib # oslo.log @@ -282,17 +272,17 @@ oslo.utils==4.10.0 # python-neutronclient # python-novaclient # python-openstackclient -packaging==21.0 +packaging==21.3 # via # oslo.utils # sphinx papero==0.2.7 # via yaks -paramiko==2.7.2 +paramiko==2.8.1 # via # -r RO-SDN-dpb/requirements.in # -r RO-plugin/requirements.in -pbr==5.6.0 +pbr==5.8.0 # via # cliff # debtcollector @@ -314,9 +304,11 @@ pbr==5.6.0 # stevedore portalocker==1.7.1 # via msal-extensions -portend==2.7.1 - # via cherrypy -prettytable==2.2.0 +portend==3.0.0 + # via + # -r requirements.in + # cherrypy +prettytable==2.4.0 # via # -r RO-VIM-vmware/requirements.in # cliff @@ -331,7 +323,7 @@ pyangbind==0.8.1 # via # -r RO-VIM-fos/requirements.in # fog05-sdk -pycparser==2.20 +pycparser==2.21 # via cffi pygments==2.10.0 # via @@ -339,17 +331,15 @@ pygments==2.10.0 # sphinx pyinotify==0.9.6 # via oslo.log -pyjwt[crypto]==2.1.0 +pyjwt[crypto]==2.3.0 # via # adal # msal pynacl==1.4.0 # via paramiko -pyone==6.0.3 - # via -r RO-VIM-opennebula/requirements.in -pyopenssl==20.0.1 +pyopenssl==21.0.0 # via python-glanceclient -pyparsing==2.4.7 +pyparsing==3.0.6 # via # cliff # oslo.utils @@ -358,7 +348,7 @@ pyperclip==1.8.2 # via cmd2 pyrsistent==0.18.0 # via jsonschema -python-cinderclient==7.4.0 +python-cinderclient==7.4.1 # via # -r RO-VIM-openstack/requirements.in # python-openstackclient @@ -366,22 +356,22 @@ python-dateutil==2.8.2 # via # adal # oslo.log -python-glanceclient==3.4.0 +python-glanceclient==3.5.0 # via -r RO-VIM-openstack/requirements.in -python-keystoneclient==4.2.0 +python-keystoneclient==4.3.0 # via # -r RO-VIM-openstack/requirements.in # python-neutronclient # python-openstackclient -python-neutronclient==7.5.0 +python-neutronclient==7.7.0 # via -r RO-VIM-openstack/requirements.in -python-novaclient==17.5.0 +python-novaclient==17.6.0 # via # -r RO-VIM-openstack/requirements.in # python-openstackclient -python-openstackclient==5.5.0 +python-openstackclient==5.7.0 # via -r RO-VIM-openstack/requirements.in -pytz==2021.1 +pytz==2021.3 # via # babel # oslo.serialization @@ -389,7 +379,7 @@ pytz==2021.1 # tempora pyvcloud==19.1.1 # via -r RO-VIM-vmware/requirements.in -pyvmomi==7.0.2 +pyvmomi==7.0.3 # via -r RO-VIM-vmware/requirements.in pyyaml==5.4.1 # via @@ -397,16 +387,16 @@ pyyaml==5.4.1 # -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 + # -r requirements.in # cliff # openstacksdk # oslo.config # pyvcloud -regex==2021.8.28 +regex==2021.11.10 # via pyangbind requests-oauthlib==1.3.0 # via msrest @@ -425,7 +415,6 @@ requests==2.26.0 # -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 @@ -437,7 +426,6 @@ requests==2.26.0 # msal # msrest # oslo.config - # pyone # python-cinderclient # python-glanceclient # python-keystoneclient @@ -450,7 +438,7 @@ requestsexceptions==1.4.0 # via openstacksdk rfc3986==1.5.0 # via oslo.config -simplejson==3.17.5 +simplejson==3.17.6 # via # osc-lib # python-cinderclient @@ -467,18 +455,16 @@ six==1.16.0 # keystoneauth1 # msrestazure # munch - # oslo.i18n # pyangbind # pynacl - # pyone # pyopenssl # python-dateutil # python-keystoneclient # pyvmomi # warlock -snowballstemmer==2.1.0 +snowballstemmer==2.2.0 # via sphinx -sphinx==4.1.2 +sphinx==4.3.1 # via -r RO-VIM-fos/requirements.in sphinxcontrib-applehelp==1.0.2 # via sphinx @@ -492,7 +478,7 @@ sphinxcontrib-qthelp==1.0.3 # via sphinx sphinxcontrib-serializinghtml==1.1.5 # via sphinx -stevedore==3.4.0 +stevedore==3.5.0 # via # cliff # dogpile.cache @@ -503,11 +489,9 @@ stevedore==3.4.0 # python-keystoneclient # python-novaclient # python-openstackclient -tblib==1.7.0 - # via pyone -tempora==4.1.1 +tempora==4.1.2 # via portend -urllib3==1.26.6 +urllib3==1.26.7 # via requests uuid==1.30 # via -r RO-SDN-arista_cloudvision/requirements.in @@ -517,12 +501,10 @@ wcwidth==0.2.5 # via # cmd2 # prettytable -wrapt==1.12.1 +wrapt==1.13.3 # via # debtcollector # python-glanceclient -xmltodict==0.12.0 - # via pyone yaks==0.3.0.post1 # via # -r RO-VIM-fos/requirements.in @@ -532,7 +514,7 @@ zc.lockfile==2.0 # via cherrypy zenoh==0.3.0 # via -r RO-VIM-fos/requirements.in -zipp==3.5.0 +zipp==3.6.0 # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: diff --git a/tox.ini b/tox.ini index 7d0a3d2f..f3313191 100644 --- a/tox.ini +++ b/tox.ini @@ -16,7 +16,7 @@ ####################################################################################### [tox] -envlist = black, flake8, pylint, safety +envlist = black, flake8, safety [tox:jenkins] toxworkdir = /tmp/.tox @@ -43,24 +43,24 @@ commands = 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 + 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 ####################################################################################### @@ -115,8 +115,8 @@ commands = - 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' + # nose2 -C --coverage RO-VIM-opennebula/osm_rovim_opennebula -s 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' @@ -127,7 +127,7 @@ commands = - 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 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_openvim # .coverage_rovim_openstack .coverage_rovim_vmware .coverage_rovim_opennebula coverage report --omit='*tests*' coverage html -d ./cover --omit='*tests*' coverage xml -o coverage.xml --omit='*tests*' @@ -153,7 +153,7 @@ commands = - 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-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 @@ -181,7 +181,7 @@ commands = - 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-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