openstack/os-ken
Code Issues Proposed changes

bgp_scenario_test/bgp: Pylint

Browse Source 
Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
This commit is contained in:
IWASE Yusuke 2016-12-05 11:07:24 +09:00 committed by FUJITA Tomonori
parent ee6cee3753
commit 4a8c7245fa
4 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ryu/tests/integrated/bgp/base.py
View File

@ -16,6 +16,7 @@
from __future__ import absolute_import from __future__ import absolute_import
import logging
import unittest import unittest
from ryu.tests.integrated.common import docker_base as ctn_base from ryu.tests.integrated.common import docker_base as ctn_base
@ -23,16 +24,17 @@ from ryu.tests.integrated.common import ryubgp
from ryu.tests.integrated.common import quagga from ryu.tests.integrated.common import quagga
class BgpSpeakerTestBase(unittest.TestCase): LOG = logging.getLogger(__name__)
class BgpSpeakerTestBase(unittest.TestCase):
images = []
containers = []
bridges = []
checktime = 120 checktime = 120
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.images = []
cls.containers = []
cls.bridges = []
cls.brdc1 = ctn_base.Bridge(name='brdc1', cls.brdc1 = ctn_base.Bridge(name='brdc1',
subnet='192.168.10.0/24') subnet='192.168.10.0/24')
cls.bridges.append(cls.brdc1) cls.bridges.append(cls.brdc1)
@ -72,7 +74,7 @@ class BgpSpeakerTestBase(unittest.TestCase):
try: try:
ctn.stop() ctn.stop()
except ctn_base.CommandError as e: except ctn_base.CommandError as e:
pass LOG.exception('Exception when stopping containers: %s', e)
ctn.remove() ctn.remove()
for br in cls.bridges: for br in cls.bridges:
br.delete() br.delete()

14
ryu/tests/integrated/bgp/base_ip6.py
View File

@ -16,6 +16,7 @@
from __future__ import absolute_import from __future__ import absolute_import
import logging
import unittest import unittest
from ryu.tests.integrated.common import docker_base as ctn_base from ryu.tests.integrated.common import docker_base as ctn_base
@ -23,16 +24,17 @@ from ryu.tests.integrated.common import ryubgp
from ryu.tests.integrated.common import quagga from ryu.tests.integrated.common import quagga
class BgpSpeakerTestBase(unittest.TestCase): LOG = logging.getLogger(__name__)
class BgpSpeakerTestBase(unittest.TestCase):
images = []
containers = []
bridges = []
checktime = 120 checktime = 120
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.images = []
cls.containers = []
cls.bridges = []
cls.brdc1 = ctn_base.Bridge(name='brip6dc1', cls.brdc1 = ctn_base.Bridge(name='brip6dc1',
subnet='2001:10::/32') subnet='2001:10::/32')
cls.bridges.append(cls.brdc1) cls.bridges.append(cls.brdc1)
@ -72,7 +74,7 @@ class BgpSpeakerTestBase(unittest.TestCase):
try: try:
ctn.stop() ctn.stop()
except ctn_base.CommandError as e: except ctn_base.CommandError as e:
pass LOG.exception('Exception when stopping containers: %s', e)
ctn.remove() ctn.remove()
for br in cls.bridges: for br in cls.bridges:
br.delete() br.delete()

8
ryu/tests/integrated/bgp/test_basic.py
View File

@ -18,8 +18,8 @@ from __future__ import absolute_import
import time import time
from . import base
from ryu.tests.integrated.common import docker_base as ctn_base from ryu.tests.integrated.common import docker_base as ctn_base
from . import base
class BgpSpeakerBasicTest(base.BgpSpeakerTestBase): class BgpSpeakerBasicTest(base.BgpSpeakerTestBase):
@ -29,7 +29,8 @@ class BgpSpeakerBasicTest(base.BgpSpeakerTestBase):
self.r1.start_ryubgp(retry=True) self.r1.start_ryubgp(retry=True)
def test_check_neighbor_established(self): def test_check_neighbor_established(self):
for i in range(0, self.checktime): neighbor_state = ctn_base.BGP_FSM_IDLE
for _ in range(0, self.checktime):
neighbor_state = self.q1.get_neighbor_state(self.r1) neighbor_state = self.q1.get_neighbor_state(self.r1)
if neighbor_state == ctn_base.BGP_FSM_ESTABLISHED: if neighbor_state == ctn_base.BGP_FSM_ESTABLISHED:
break break
@ -37,7 +38,8 @@ class BgpSpeakerBasicTest(base.BgpSpeakerTestBase):
self.assertEqual(neighbor_state, ctn_base.BGP_FSM_ESTABLISHED) self.assertEqual(neighbor_state, ctn_base.BGP_FSM_ESTABLISHED)
def test_check_rib_nexthop(self): def test_check_rib_nexthop(self):
for i in range(0, self.checktime): neighbor_state = ctn_base.BGP_FSM_IDLE
for _ in range(0, self.checktime):
neighbor_state = self.q1.get_neighbor_state(self.r1) neighbor_state = self.q1.get_neighbor_state(self.r1)
if neighbor_state == ctn_base.BGP_FSM_ESTABLISHED: if neighbor_state == ctn_base.BGP_FSM_ESTABLISHED:
break break

8
ryu/tests/integrated/bgp/test_ip6_basic.py
View File

@ -18,8 +18,8 @@ from __future__ import absolute_import
import time import time
from . import base_ip6 as base
from ryu.tests.integrated.common import docker_base as ctn_base from ryu.tests.integrated.common import docker_base as ctn_base
from . import base_ip6 as base
class BgpSpeakerBasicTest(base.BgpSpeakerTestBase): class BgpSpeakerBasicTest(base.BgpSpeakerTestBase):
@ -29,7 +29,8 @@ class BgpSpeakerBasicTest(base.BgpSpeakerTestBase):
self.r1.start_ryubgp(retry=True) self.r1.start_ryubgp(retry=True)
def test_check_neighbor_established(self): def test_check_neighbor_established(self):
for i in range(0, self.checktime): neighbor_state = ctn_base.BGP_FSM_IDLE
for _ in range(0, self.checktime):
neighbor_state = self.q1.get_neighbor_state(self.r1) neighbor_state = self.q1.get_neighbor_state(self.r1)
if neighbor_state == ctn_base.BGP_FSM_ESTABLISHED: if neighbor_state == ctn_base.BGP_FSM_ESTABLISHED:
break break
@ -37,7 +38,8 @@ class BgpSpeakerBasicTest(base.BgpSpeakerTestBase):
self.assertEqual(neighbor_state, ctn_base.BGP_FSM_ESTABLISHED) self.assertEqual(neighbor_state, ctn_base.BGP_FSM_ESTABLISHED)
def test_check_rib_nexthop(self): def test_check_rib_nexthop(self):
for i in range(0, self.checktime): neighbor_state = ctn_base.BGP_FSM_IDLE
for _ in range(0, self.checktime):
neighbor_state = self.q1.get_neighbor_state(self.r1) neighbor_state = self.q1.get_neighbor_state(self.r1)
if neighbor_state == ctn_base.BGP_FSM_ESTABLISHED: if neighbor_state == ctn_base.BGP_FSM_ESTABLISHED:
break break