From 2f99505fff582e1213d5cafe9c87d06c87d9af7d Mon Sep 17 00:00:00 2001 From: Gulsum Atici Date: Wed, 23 Nov 2022 16:06:40 +0300 Subject: [PATCH] Enabling Pylint in RO and removing unused methods Enabling pylint, removing some unused and erroneous methods, updating required libraries. Change-Id: I7ad823f83faa1fd9f055a92041cabc7a53f707ac Signed-off-by: Gulsum Atici --- NG-RO/osm_ng_ro/ns_thread.py | 2 +- NG-RO/osm_ng_ro/ro_main.py | 2 + .../osm_rosdn_dynpac/wimconn_dynpac.py | 8 +- .../osm_rosdn_juniper_contrail/rest_lib.py | 4 +- .../osm_rosdn_juniper_contrail/sdn_api.py | 11 -- RO-VIM-aws/osm_rovim_aws/vimconn_aws.py | 47 ----- .../osm_rovim_openstack/vimconn_openstack.py | 54 ------ RO-plugin/osm_ro_plugin/openflow_conn.py | 2 +- devops-stages/stage-build.sh | 2 +- devops-stages/stage-test.sh | 2 +- .../enabling_pylint-209bc644f489aa17.yaml | 22 +++ requirements-test.txt | 12 +- requirements.txt | 163 +++++++++--------- tox.ini | 36 ++-- 14 files changed, 138 insertions(+), 229 deletions(-) create mode 100644 releasenotes/notes/enabling_pylint-209bc644f489aa17.yaml diff --git a/NG-RO/osm_ng_ro/ns_thread.py b/NG-RO/osm_ng_ro/ns_thread.py index ed971dc9..6e949568 100644 --- a/NG-RO/osm_ng_ro/ns_thread.py +++ b/NG-RO/osm_ng_ro/ns_thread.py @@ -1791,9 +1791,9 @@ class NsWorker(threading.Thread): ) plugin_name = "" vim = None + step = "Getting {}={} from db".format(target, _id) try: - step = "Getting {}={} from db".format(target, _id) # TODO process for wim, sdnc, ... vim = self.db.get_one(target_database, {"_id": _id}) diff --git a/NG-RO/osm_ng_ro/ro_main.py b/NG-RO/osm_ng_ro/ro_main.py index 9500ea24..86e839c6 100644 --- a/NG-RO/osm_ng_ro/ro_main.py +++ b/NG-RO/osm_ng_ro/ro_main.py @@ -214,6 +214,8 @@ class Server(object): } def _format_in(self, kwargs): + + error_text = "" try: indata = None diff --git a/RO-SDN-dynpac/osm_rosdn_dynpac/wimconn_dynpac.py b/RO-SDN-dynpac/osm_rosdn_dynpac/wimconn_dynpac.py index dfd4b358..a2bd8d7a 100644 --- a/RO-SDN-dynpac/osm_rosdn_dynpac/wimconn_dynpac.py +++ b/RO-SDN-dynpac/osm_rosdn_dynpac/wimconn_dynpac.py @@ -228,9 +228,11 @@ class DynpacConnector(SdnConnectorBase): for connection_point in connection_points: endpoint_id = connection_point.get(self.__SERVICE_ENDPOINT_PARAM) - port = filter( - lambda x: x.get(self.__WAN_SERVICE_ENDPOINT_PARAM) == endpoint_id, - port_mapping, + port = list( + filter( + lambda x: x.get(self.__WAN_SERVICE_ENDPOINT_PARAM) == endpoint_id, + port_mapping, + ) )[0] port_info = port.get(self.__WAN_MAPPING_INFO_PARAM) selected_ports.append(port_info) diff --git a/RO-SDN-juniper_contrail/osm_rosdn_juniper_contrail/rest_lib.py b/RO-SDN-juniper_contrail/osm_rosdn_juniper_contrail/rest_lib.py index 31ea213b..fff489d6 100644 --- a/RO-SDN-juniper_contrail/osm_rosdn_juniper_contrail/rest_lib.py +++ b/RO-SDN-juniper_contrail/osm_rosdn_juniper_contrail/rest_lib.py @@ -162,9 +162,7 @@ class ContrailHttp(object): except AuthError: # If there is an auth error retry just once if retry_auth_error: - return self._request( - self, op, url, headers, data, retry_auth_error=False - ) + return self._request(op, url, headers, data, retry_auth_error=False) def _request_noauth(self, op, url, headers, data=None): # Method to execute http requests with error control diff --git a/RO-SDN-juniper_contrail/osm_rosdn_juniper_contrail/sdn_api.py b/RO-SDN-juniper_contrail/osm_rosdn_juniper_contrail/sdn_api.py index 6d08def4..0b4f9a8a 100644 --- a/RO-SDN-juniper_contrail/osm_rosdn_juniper_contrail/sdn_api.py +++ b/RO-SDN-juniper_contrail/osm_rosdn_juniper_contrail/sdn_api.py @@ -197,9 +197,6 @@ class UnderlayApi: "virtual-network" ) - def get_virtual_networks(self): - return self.get_all_by_type("virtual-networks") - def get_virtual_network(self, network_id): return self.get_by_uuid("virtual-network", network_id) @@ -239,9 +236,6 @@ class UnderlayApi: def get_vpgs(self): return self.get_all_by_type(self.controller_url, "virtual-port-groups") - def get_vpg(self, vpg_id): - return self.get_by_uuid(self.controller_url, "virtual-port-group", vpg_id) - def get_vpg_by_name(self, vpg_name): fq_name = ["default-global-system-config", self.fabric, vpg_name] @@ -306,11 +300,6 @@ class UnderlayApi: "virtual-machine-interface" ) - def get_vmi(self, vmi_uuid): - return self.get_by_uuid( - self.controller_url, "virtual-machine-interface", vmi_uuid - ) - def delete_vmi(self, uuid): self.logger.debug("delete vmi uuid: {}".format(uuid)) self.delete_by_uuid(self.controller_url, "virtual-machine-interface", uuid) diff --git a/RO-VIM-aws/osm_rovim_aws/vimconn_aws.py b/RO-VIM-aws/osm_rovim_aws/vimconn_aws.py index 5fc07041..63184a1a 100644 --- a/RO-VIM-aws/osm_rovim_aws/vimconn_aws.py +++ b/RO-VIM-aws/osm_rovim_aws/vimconn_aws.py @@ -606,52 +606,6 @@ class vimconnector(vimconn.VimConnector): except Exception as e: self.format_vimconn_exception(e) - def get_flavor_id_from_data(self, flavor_dict): - """Obtain flavor id that match the flavor description - Params: - 'flavor_dict': dictionary that contains: - 'disk': main hard disk in GB - 'ram': memory in MB - 'vcpus': number of virtual cpus - #todo: complete parameters for EPA - Returns the flavor_id or raises a vimconnNotFoundException - """ - self.logger.debug("Getting flavor id from data") - - try: - flavor = None - for key, values in self.flavor_info.items(): - if (values["ram"], values["cpus"], values["disk"]) == ( - flavor_dict["ram"], - flavor_dict["vcpus"], - flavor_dict["disk"], - ): - flavor = (key, values) - break - elif (values["ram"], values["cpus"], values["disk"]) >= ( - flavor_dict["ram"], - flavor_dict["vcpus"], - flavor_dict["disk"], - ): - if not flavor: - flavor = (key, values) - else: - if (flavor[1]["ram"], flavor[1]["cpus"], flavor[1]["disk"]) >= ( - values["ram"], - values["cpus"], - values["disk"], - ): - flavor = (key, values) - - if flavor: - return flavor[0] - - raise vimconn.VimConnNotFoundException( - "Cannot find flavor with this flavor ID/Name" - ) - except Exception as e: - self.format_vimconn_exception(e) - def new_image(self, image_dict): """Adds a tenant image to VIM Params: image_dict @@ -993,7 +947,6 @@ class vimconnector(vimconn.VimConnector): else: raise vimconn.VimConnException( "Failed to get instance_id for reservation", - reservation, http_code=vimconn.HTTP_Request_Timeout, ) diff --git a/RO-VIM-openstack/osm_rovim_openstack/vimconn_openstack.py b/RO-VIM-openstack/osm_rovim_openstack/vimconn_openstack.py index 00558dc6..2f7a5ef1 100644 --- a/RO-VIM-openstack/osm_rovim_openstack/vimconn_openstack.py +++ b/RO-VIM-openstack/osm_rovim_openstack/vimconn_openstack.py @@ -3320,60 +3320,6 @@ class vimconnector(vimconn.VimConnector): ) ) - # NOT USED FUNCTIONS - - def new_external_port(self, port_data): - """Adds a external port to VIM - Returns the port identifier""" - # TODO openstack if needed - return ( - -vimconn.HTTP_Internal_Server_Error, - "osconnector.new_external_port() not implemented", - ) - - def connect_port_network(self, port_id, network_id, admin=False): - """Connects a external port to a network - Returns status code of the VIM response""" - # TODO openstack if needed - return ( - -vimconn.HTTP_Internal_Server_Error, - "osconnector.connect_port_network() not implemented", - ) - - def new_user(self, user_name, user_passwd, tenant_id=None): - """Adds a new user to openstack VIM - Returns the user identifier""" - self.logger.debug("osconnector: Adding a new user to VIM") - - try: - self._reload_connection() - user = self.keystone.users.create( - user_name, password=user_passwd, default_project=tenant_id - ) - # self.keystone.tenants.add_user(self.k_creds["username"], #role) - - return user.id - except ksExceptions.ConnectionError as e: - error_value = -vimconn.HTTP_Bad_Request - error_text = ( - type(e).__name__ - + ": " - + (str(e) if len(e.args) == 0 else str(e.args[0])) - ) - except ksExceptions.ClientException as e: # TODO remove - error_value = -vimconn.HTTP_Bad_Request - error_text = ( - type(e).__name__ - + ": " - + (str(e) if len(e.args) == 0 else str(e.args[0])) - ) - - # TODO insert exception vimconn.HTTP_Unauthorized - # if reaching here is because an exception - self.logger.debug("new_user " + error_text) - - return error_value, error_text - def delete_user(self, user_id): """Delete a user from openstack VIM Returns the user identifier""" diff --git a/RO-plugin/osm_ro_plugin/openflow_conn.py b/RO-plugin/osm_ro_plugin/openflow_conn.py index afc0b821..c41d7bc8 100644 --- a/RO-plugin/osm_ro_plugin/openflow_conn.py +++ b/RO-plugin/osm_ro_plugin/openflow_conn.py @@ -286,9 +286,9 @@ class SdnConnectorOpenFlow(SdnConnectorBase): rules_to_delete = created_items.get("installed_rules_ids") or [] new_installed_rules_ids = [] error_list = [] + step = "Checking ports and network type compatibility" try: - step = "Checking ports and network type compatibility" if ifaces_nb < 2: pass elif net_type == "ELINE": diff --git a/devops-stages/stage-build.sh b/devops-stages/stage-build.sh index 88182897..c0ca1881 100755 --- a/devops-stages/stage-build.sh +++ b/devops-stages/stage-build.sh @@ -39,7 +39,7 @@ dist_ro_vim_gcp" TOX_ENV_LIST="$(echo $PACKAGES | sed "s/ /,/g")" PROCESSES=$(expr `nproc --a` / 2) -TOX_PARALLEL_NO_SPINNER=1 tox -e $TOX_ENV_LIST --parallel $PROCESSES +TOX_PARALLEL_NO_SPINNER=1 tox -e $TOX_ENV_LIST # Copying packages # RO plugin diff --git a/devops-stages/stage-test.sh b/devops-stages/stage-test.sh index bfcdf9bd..23f2dd68 100755 --- a/devops-stages/stage-test.sh +++ b/devops-stages/stage-test.sh @@ -14,6 +14,6 @@ # limitations under the License. set -e echo "Launching tox" -tox --parallel=auto +tox diff --git a/releasenotes/notes/enabling_pylint-209bc644f489aa17.yaml b/releasenotes/notes/enabling_pylint-209bc644f489aa17.yaml new file mode 100644 index 00000000..ec5848fb --- /dev/null +++ b/releasenotes/notes/enabling_pylint-209bc644f489aa17.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. +####################################################################################### +--- +other: + - | + Enabling Pylint in tox.ini, removing some unused and erroneous methods, + updating required libraries. + diff --git a/requirements-test.txt b/requirements-test.txt index 89f79596..c7c2f90a 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -16,13 +16,9 @@ ####################################################################################### -e RO-plugin # via -r requirements-test.in -coverage==6.4.1 - # via - # -r requirements-test.in - # nose2 -mock==4.0.3 +coverage==7.0.5 # via -r requirements-test.in -nose2==0.11.0 +mock==5.0.1 + # via -r requirements-test.in +nose2==0.12.0 # via -r requirements-test.in -six==1.16.0 - # via nose2 diff --git a/requirements.txt b/requirements.txt index 336db96a..3f146d05 100644 --- a/requirements.txt +++ b/requirements.txt @@ -18,7 +18,9 @@ adal==1.2.7 # via msrestazure appdirs==1.4.4 # via openstacksdk -attrs==21.4.0 +atpublic==3.1.1 + # via flufl-enum +attrs==22.2.0 # via # cmd2 # jsonschema @@ -30,53 +32,52 @@ azure-common==1.1.28 # azure-mgmt-compute # azure-mgmt-network # azure-mgmt-resource -azure-core==1.24.1 +azure-core==1.26.2 # via # azure-identity # azure-mgmt-core # msrest -azure-identity==1.10.0 +azure-identity==1.12.0 # via -r RO-VIM-azure/requirements.in -azure-mgmt-compute==27.1.0 +azure-mgmt-compute==29.0.0 # via -r RO-VIM-azure/requirements.in -azure-mgmt-core==1.3.1 +azure-mgmt-core==1.3.2 # via # azure-mgmt-compute # azure-mgmt-network # azure-mgmt-resource -azure-mgmt-network==20.0.0 +azure-mgmt-network==22.2.0 # via -r RO-VIM-azure/requirements.in -azure-mgmt-resource==21.1.0 +azure-mgmt-resource==22.0.0 # via -r RO-VIM-azure/requirements.in -bcrypt==3.2.2 +bcrypt==4.0.1 # via paramiko boto==2.49.0 # via -r RO-VIM-aws/requirements.in -cachetools==5.2.0 +cachetools==5.2.1 # via google-auth -certifi==2022.6.15 +certifi==2022.12.7 # via # msrest # requests -cffi==1.15.0 +cffi==1.15.1 # via - # bcrypt # cryptography # pynacl -charset-normalizer==2.0.12 +charset-normalizer==3.0.1 # via requests -cheroot==8.6.0 +cheroot==9.0.0 # via cherrypy cherrypy==18.1.2 # via -r NG-RO/requirements.in -cliff==3.10.1 +cliff==4.1.0 # via # osc-lib # python-neutronclient # python-openstackclient -cmd2==2.4.1 +cmd2==2.4.2 # via cliff -cryptography==37.0.2 +cryptography==39.0.0 # via # -r NG-RO/requirements.in # adal @@ -86,7 +87,7 @@ cryptography==37.0.2 # paramiko # pyjwt # pyopenssl -cvprac==1.2.0 +cvprac==1.2.2 # via -r RO-SDN-arista_cloudvision/requirements.in debtcollector==2.5.0 # via @@ -100,15 +101,15 @@ decorator==5.1.1 # via # dogpile-cache # openstacksdk -dogpile-cache==1.1.6 +dogpile-cache==1.1.8 # via openstacksdk -flufl-enum==4.1.1 +flufl-enum==5.0.1 # via pyvcloud -google-api-core==2.8.2 +google-api-core==2.11.0 # via google-api-python-client -google-api-python-client==2.51.0 +google-api-python-client==2.72.0 # via -r RO-VIM-gcp/requirements.in -google-auth==2.8.0 +google-auth==2.16.0 # via # -r RO-VIM-gcp/requirements.in # google-api-core @@ -118,21 +119,25 @@ google-auth-httplib2==0.1.0 # via google-api-python-client google-cloud==0.34.0 # via -r RO-VIM-gcp/requirements.in -googleapis-common-protos==1.56.3 +googleapis-common-protos==1.58.0 # via google-api-core -httplib2==0.20.4 +httplib2==0.21.0 # via # google-api-python-client # google-auth-httplib2 humanfriendly==10.0 # via pyvcloud -idna==3.3 +idna==3.4 # via requests -importlib-metadata==4.11.4 - # via -r NG-RO/requirements.in +importlib-metadata==6.0.0 + # via + # -r NG-RO/requirements.in + # cliff +importlib-resources==5.10.2 + # via jsonschema ipconflict==0.5.0 # via -r RO-VIM-aws/requirements.in -iso8601==1.0.2 +iso8601==1.1.0 # via # keystoneauth1 # openstacksdk @@ -142,10 +147,8 @@ iso8601==1.0.2 # python-openstackclient isodate==0.6.1 # via msrest -jaraco-functools==3.5.0 - # via - # cheroot - # tempora +jaraco-functools==3.5.2 + # via cheroot jinja2==3.1.2 # via -r NG-RO/requirements.in jmespath==1.0.1 @@ -156,9 +159,9 @@ jsonpatch==1.32 # warlock jsonpointer==2.3 # via jsonpatch -jsonschema==3.2.0 +jsonschema==4.17.3 # via warlock -keystoneauth1==4.6.0 +keystoneauth1==5.1.1 # via # openstacksdk # osc-lib @@ -169,16 +172,16 @@ keystoneauth1==4.6.0 # python-novaclient logutils==0.3.5 # via -r NG-RO/requirements.in -lxml==4.9.0 +lxml==4.9.2 # via pyvcloud markupsafe==2.1.1 # via jinja2 -more-itertools==8.13.0 +more-itertools==9.0.0 # via # cheroot # cherrypy # jaraco-functools -msal==1.18.0 +msal==1.20.0 # via # azure-identity # msal-extensions @@ -213,9 +216,9 @@ netifaces==0.11.0 # via # openstacksdk # oslo-utils -oauthlib==3.2.0 +oauthlib==3.2.2 # via requests-oauthlib -openstacksdk==0.99.0 +openstacksdk==0.103.0 # via # os-client-config # osc-lib @@ -226,15 +229,15 @@ os-service-types==1.7.0 # via # keystoneauth1 # openstacksdk -osc-lib==2.6.0 +osc-lib==2.6.2 # via # python-neutronclient # python-openstackclient -oslo-config==8.8.0 +oslo-config==9.1.0 # via # oslo-log # python-keystoneclient -oslo-context==4.1.0 +oslo-context==5.0.0 # via oslo-log oslo-i18n==5.1.0 # via @@ -248,15 +251,15 @@ oslo-i18n==5.1.0 # python-neutronclient # python-novaclient # python-openstackclient -oslo-log==5.0.0 +oslo-log==5.0.2 # via python-neutronclient -oslo-serialization==4.3.0 +oslo-serialization==5.0.0 # via # oslo-log # python-keystoneclient # python-neutronclient # python-novaclient -oslo-utils==6.0.0 +oslo-utils==6.1.0 # via # osc-lib # oslo-log @@ -267,18 +270,17 @@ oslo-utils==6.0.0 # python-neutronclient # python-novaclient # python-openstackclient -packaging==21.3 +packaging==23.0 # via # oslo-utils # python-keystoneclient -paramiko==2.11.0 +paramiko==2.12.0 # via # -r RO-SDN-dpb/requirements.in # -r RO-VIM-gcp/requirements.in # -r RO-plugin/requirements.in -pbr==5.9.0 +pbr==5.11.1 # via - # cliff # keystoneauth1 # openstacksdk # os-service-types @@ -294,11 +296,13 @@ pbr==5.9.0 # python-novaclient # python-openstackclient # stevedore -portalocker==2.4.0 +pkgutil-resolve-name==1.3.10 + # via jsonschema +portalocker==2.6.0 # via msal-extensions portend==3.1.0 # via cherrypy -prettytable==3.3.0 +prettytable==3.6.0 # via # -r RO-VIM-vmware/requirements.in # cliff @@ -307,7 +311,7 @@ prettytable==3.3.0 # python-novaclient progressbar==2.5 # via -r RO-VIM-vmware/requirements.in -protobuf==4.21.1 +protobuf==4.21.12 # via # google-api-core # googleapis-common-protos @@ -321,27 +325,25 @@ pyasn1-modules==0.2.8 # via google-auth pycparser==2.21 # via cffi -pygments==2.12.0 +pygments==2.14.0 # via pyvcloud pyinotify==0.9.6 # via oslo-log -pyjwt[crypto]==2.4.0 +pyjwt[crypto]==2.6.0 # via # adal # msal pynacl==1.5.0 # via paramiko -pyopenssl==22.0.0 +pyopenssl==23.0.0 # via python-glanceclient pyparsing==3.0.9 # via - # cliff # httplib2 # oslo-utils - # packaging pyperclip==1.8.2 # via cmd2 -pyrsistent==0.18.1 +pyrsistent==0.19.3 # via jsonschema python-cinderclient==7.4.1 # via @@ -351,29 +353,29 @@ python-dateutil==2.8.2 # via # adal # oslo-log -python-glanceclient==4.0.0 +python-glanceclient==4.2.0 # via -r RO-VIM-openstack/requirements.in -python-keystoneclient==4.5.0 +python-keystoneclient==5.0.1 # via # -r RO-VIM-openstack/requirements.in # python-neutronclient # python-openstackclient -python-neutronclient==7.8.0 +python-neutronclient==8.2.1 # via -r RO-VIM-openstack/requirements.in -python-novaclient==18.0.0 +python-novaclient==18.2.0 # via # -r RO-VIM-openstack/requirements.in # python-openstackclient -python-openstackclient==5.8.0 +python-openstackclient==6.0.0 # via -r RO-VIM-openstack/requirements.in -pytz==2022.1 +pytz==2022.7.1 # via # oslo-serialization # oslo-utils # tempora pyvcloud==19.1.1 # via -r RO-VIM-vmware/requirements.in -pyvmomi==7.0.3 +pyvmomi==8.0.0.1.1 # via -r RO-VIM-vmware/requirements.in pyyaml==5.4.1 # via @@ -389,7 +391,7 @@ pyyaml==5.4.1 # openstacksdk # oslo-config # pyvcloud -requests==2.28.0 +requests==2.28.2 # via # -r NG-RO/requirements.in # -r RO-SDN-arista_cloudvision/requirements.in @@ -420,7 +422,6 @@ requests==2.28.0 # python-keystoneclient # python-neutronclient # pyvcloud - # pyvmomi # requests-oauthlib requests-oauthlib==1.3.1 # via msrest @@ -428,9 +429,9 @@ requestsexceptions==1.4.0 # via openstacksdk rfc3986==2.0.0 # via oslo-config -rsa==4.8 +rsa==4.9 # via google-auth -simplejson==3.17.6 +simplejson==3.18.1 # via # osc-lib # python-cinderclient @@ -443,7 +444,6 @@ six==1.16.0 # google-auth # google-auth-httplib2 # isodate - # jsonschema # keystoneauth1 # msrestazure # munch @@ -451,8 +451,7 @@ six==1.16.0 # python-dateutil # python-keystoneclient # pyvmomi - # warlock -stevedore==3.5.0 +stevedore==4.1.1 # via # cliff # dogpile-cache @@ -463,21 +462,21 @@ stevedore==3.5.0 # python-keystoneclient # python-novaclient # python-openstackclient -tempora==5.0.1 +tempora==5.2.0 # via portend -tqdm==4.64.0 +tqdm==4.64.1 # via ipconflict -typing-extensions==4.2.0 +typing-extensions==4.4.0 # via azure-core uritemplate==4.1.1 # via google-api-python-client -urllib3==1.26.9 +urllib3==1.26.14 # via requests uuid==1.30 # via -r RO-SDN-arista_cloudvision/requirements.in -warlock==1.3.3 +warlock==2.0.1 # via python-glanceclient -wcwidth==0.2.5 +wcwidth==0.2.6 # via # cmd2 # prettytable @@ -487,8 +486,10 @@ wrapt==1.14.1 # python-glanceclient zc-lockfile==2.0 # via cherrypy -zipp==3.8.0 - # via importlib-metadata +zipp==3.11.0 + # via + # importlib-metadata + # importlib-resources # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/tox.ini b/tox.ini index 04a5ad51..42dfdc47 100644 --- a/tox.ini +++ b/tox.ini @@ -16,7 +16,7 @@ ####################################################################################### [tox] -envlist = black, flake8, safety, cover +envlist = black, cover, flake8, pylint, safety [tox:jenkins] toxworkdir = /tmp/.tox @@ -170,23 +170,23 @@ deps = {[testenv]deps} 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-openstack/osm_rovim_openstack - - pylint -E RO-VIM-openvim/osm_rovim_openvim - - pylint -E RO-VIM-vmware/osm_rovim_vmware - - pylint -E RO-VIM-gcp/osm_rovim_gcp + pylint -E NG-RO/osm_ng_ro --disable=E1101 + pylint -E RO-plugin/osm_ro_plugin --disable=E1101 + pylint -E RO-SDN-arista_cloudvision/osm_rosdn_arista_cloudvision --disable=all + pylint -E RO-SDN-dpb/osm_rosdn_dpb + pylint -E RO-SDN-dynpac/osm_rosdn_dynpac --disable=E1101 + pylint -E RO-SDN-floodlight_openflow/osm_rosdn_floodlightof + pylint -E RO-SDN-ietfl2vpn/osm_rosdn_ietfl2vpn --disable=E1101 + 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 --disable=E1101 + pylint -E RO-VIM-aws/osm_rovim_aws + pylint -E RO-VIM-azure/osm_rovim_azure --disable=all + pylint -E RO-VIM-openstack/osm_rovim_openstack --disable=E1101 + pylint -E RO-VIM-openvim/osm_rovim_openvim --disable=all + pylint -E RO-VIM-vmware/osm_rovim_vmware --disable=all + pylint -E RO-VIM-gcp/osm_rovim_gcp --disable=E1101 ####################################################################################### -- 2.17.1