X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FNATUtil.py;h=e08a6daf820392c536f649d021f85c4fffd991bd;hb=ada7009a3c826430e83a29c31bdf9a5973986ad9;hp=ea13c9411fd58a7107e74a440c65f9d47e66bd1a;hpb=2bdb1dc59ba736546a6663cbaf55b6edbcac6eab;p=csit.git diff --git a/resources/libraries/python/NATUtil.py b/resources/libraries/python/NATUtil.py index ea13c9411f..e08a6daf82 100644 --- a/resources/libraries/python/NATUtil.py +++ b/resources/libraries/python/NATUtil.py @@ -1,4 +1,4 @@ -# Copyright (c) 2017 Cisco and/or its affiliates. +# Copyright (c) 2018 Cisco and/or its affiliates. # 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: @@ -35,7 +35,7 @@ class NATUtil(object): :returns: Response of the command. :rtype: str :raises RuntimeError: If setting of inside and outside interfaces for - NAT44 fails. + NAT44 fails. """ try: @@ -65,7 +65,7 @@ class NATUtil(object): :returns: Response of the command. :rtype: str :raises RuntimeError: If setting of deterministic behaviour of NAT44 - fails. + fails. """ try: @@ -84,8 +84,8 @@ class NATUtil(object): """Set NAT workers. :param node: DUT node. - :param lcores: list of cores, format: range e.g. 1-5 or list of ranges - e.g.: 1-5,18-22. + :param lcores: List of cores, format: range e.g. 1-5 or list of ranges + e.g.: 1-5,18-22. :type node: dict :type lcores: str :returns: Response of the command. @@ -131,7 +131,7 @@ class NATUtil(object): :returns: Response of the command. :rtype: str :raises RuntimeError: If command 'exec snat deterministic forward' - fails. + fails. """ try: @@ -156,7 +156,7 @@ class NATUtil(object): :returns: Response of the command. :rtype: str :raises RuntimeError: If command 'exec snat deterministic reverse' - fails. + fails. """ try: @@ -197,9 +197,9 @@ class NATUtil(object): items = line.split(" ") while "" in items: items.remove("") - if len(items) == 0: + if not items: continue - elif len(items) == 4: + if len(items) == 4: # no ports were returned data.append({ "local_address": items[0], @@ -246,9 +246,9 @@ class NATUtil(object): for trash in ("", "vat#"): while trash in items: items.remove(trash) - if len(items) == 0: + if not items: continue - elif len(items) == 3: + if len(items) == 3: data.append({ # items[0] is the table header - "sw_if_index" "sw_if_index": items[1],