PEP 8 clean thanks to auto pep8

This commit is contained in:
Julien Duponchelle committed 2015-01-20 13:24:00 +01:00
1 parent 7f185663d1
commit f5ed9fbcf1
124 files changed
+340 -210

No files matched your search

@@ -24,6 +24,7 @@ from ..dynamips_error import DynamipsError
class ATMBridge(object):
"""
Dynamips bridge switch.
@@ -33,7 +34,7 @@ class ATMBridge(object):
def __init__(self, hypervisor, name):
#FIXME: instance tracking
# FIXME: instance tracking
self._hypervisor = hypervisor
self._name = '"' + name + '"' # put name into quotes to protect spaces
self._hypervisor.send("atm_bridge create {}".format(self._name))
@@ -28,6 +28,7 @@ log = logging.getLogger(__name__)
class ATMSwitch(object):
"""
Dynamips ATM switch.
@@ -22,6 +22,7 @@ http://github.com/GNS3/dynamips/blob/master/README.hypervisor#L538
class Bridge(object):
"""
Dynamips bridge.
@@ -29,6 +29,7 @@ log = logging.getLogger(__name__)
class C1700(Router):
"""
Dynamips c1700 router.
@@ -31,6 +31,7 @@ log = logging.getLogger(__name__)
class C2600(Router):
"""
Dynamips c2600 router.
@@ -28,6 +28,7 @@ log = logging.getLogger(__name__)
class C2691(Router):
"""
Dynamips c2691 router.
@@ -28,6 +28,7 @@ log = logging.getLogger(__name__)
class C3600(Router):
"""
Dynamips c3600 router.
@@ -28,6 +28,7 @@ log = logging.getLogger(__name__)
class C3725(Router):
"""
Dynamips c3725 router.
@@ -28,6 +28,7 @@ log = logging.getLogger(__name__)
class C3745(Router):
"""
Dynamips c3745 router.
+4 -3
View File
@@ -30,6 +30,7 @@ log = logging.getLogger(__name__)
class C7200(Router):
"""
Dynamips c7200 router (model is 7206).
@@ -227,9 +228,9 @@ class C7200(Router):
powered_on=power_supply))
log.info("router {name} [id={id}]: power supply {power_supply_id} state updated to {powered_on}".format(name=self._name,
id=self._id,
power_supply_id=power_supply_id,
powered_on=power_supply))
id=self._id,
power_supply_id=power_supply_id,
powered_on=power_supply))
power_supply_id += 1
self._power_supplies = power_supplies
@@ -28,6 +28,7 @@ log = logging.getLogger(__name__)
class EthernetSwitch(object):
"""
Dynamips Ethernet switch.
@@ -268,9 +269,9 @@ class EthernetSwitch(object):
outer_vlan=outer_vlan))
log.info("Ethernet switch {name} [id={id}]: port {port} set as a QinQ port with outer VLAN {vlan_id}".format(name=self._name,
id=self._id,
port=port,
vlan_id=outer_vlan))
id=self._id,
port=port,
vlan_id=outer_vlan))
self._mapping[port] = ("qinq", outer_vlan)
def get_mac_addr_table(self):
@@ -28,6 +28,7 @@ log = logging.getLogger(__name__)
class FrameRelaySwitch(object):
"""
Dynamips Frame Relay switch.
+1
View File
@@ -28,6 +28,7 @@ log = logging.getLogger(__name__)
class Hub(Bridge):
"""
Dynamips hub (based on Bridge)
+2 -1
View File
@@ -33,6 +33,7 @@ log = logging.getLogger(__name__)
class Router(object):
"""
Dynamips router implementation.
@@ -575,7 +576,7 @@ class Router(object):
try:
reply = self._hypervisor.send("vm extract_config {}".format(self._name))[0].rsplit(' ', 2)[-2:]
except IOError:
#for some reason Dynamips gets frozen when it does not find the magic number in the NVRAM file.
# for some reason Dynamips gets frozen when it does not find the magic number in the NVRAM file.
return None, None
startup_config = reply[0][1:-1] # get statup-config and remove single quotes
private_config = reply[1][1:-1] # get private-config and remove single quotes