diff options
author | meimei <meimei@huawei.com> | 2016-11-29 18:05:01 +0800 |
---|---|---|
committer | meimei <meimei@huawei.com> | 2016-11-29 18:09:16 +0800 |
commit | 6b2eccf0350f7f053e18ea2ac190489b00960809 (patch) | |
tree | 8968b2871c4bfc23bfa7077e857dae4d151e53d2 /deploy/adapters/ansible/roles | |
parent | fcd0eefae931bb7bed0380574c1c7acaa31ffa28 (diff) |
Improve compass ci verification, clear all the warnnings
JIRA: COMPASS-494
MODIFY BY HAOJINGBO
Change-Id: I2b95d84157c860254b3b3f68f7b2a54393caf8f4
Signed-off-by: meimei <meimei@huawei.com>
Diffstat (limited to 'deploy/adapters/ansible/roles')
8 files changed, 138 insertions, 64 deletions
diff --git a/deploy/adapters/ansible/roles/odl_cluster/files/recover_network.py b/deploy/adapters/ansible/roles/odl_cluster/files/recover_network.py index 8d48ac1c..0b11b6df 100755 --- a/deploy/adapters/ansible/roles/odl_cluster/files/recover_network.py +++ b/deploy/adapters/ansible/roles/odl_cluster/files/recover_network.py @@ -6,21 +6,25 @@ import log as logging LOG = logging.getLogger("net-recover") config_path = os.path.join(os.path.dirname(__file__), "network.cfg") + def setup_bondings(bond_mappings): print bond_mappings + def add_ovs_port(ovs_br, ifname, uplink, vlan_id=None): LOG.info("add_ovs_port enter") cmd = "ovs-vsctl --may-exist add-port %s %s" % (ovs_br, ifname) if vlan_id: cmd += " tag=%s" % vlan_id cmd += " -- set Interface %s type=internal;" % ifname - cmd += "ip link set dev %s address `ip link show %s |awk '/link\/ether/{print $2}'`;" \ - % (ifname, uplink) + cmd += "ip link set dev %s address `ip link show %s |awk \ + '/link\/ether/{print $2}'`;" \ + % (ifname, uplink) cmd += "ip link set %s up;" % ifname LOG.info("add_ovs_port: cmd=%s" % cmd) os.system(cmd) + def setup_ips(ip_settings, sys_intf_mappings): LOG.info("setup_ips enter") for intf_info in ip_settings.values(): @@ -31,24 +35,27 @@ def setup_ips(ip_settings, sys_intf_mappings): intf_name = intf_info["alias"] if "gw" in intf_info: cmd = "ip addr add %s/%s brd %s dev %s;" \ - % (intf_info["ip"], intf_info["netmask"], str(network.broadcast),intf_name) + % (intf_info["ip"], intf_info["netmask"], str(network.broadcast), intf_name) # noqa: E501 cmd += "route del default;" - cmd += "ip route add default via %s dev %s" % (intf_info["gw"], intf_name) + cmd += "ip route add default via %s dev %s" % ( + intf_info["gw"], intf_name) LOG.info("setup_ips: cmd=%s" % cmd) os.system(cmd) + def setup_intfs(sys_intf_mappings, uplink_map): LOG.info("setup_intfs enter") for intf_name, intf_info in sys_intf_mappings.items(): if intf_info["type"] == "ovs": add_ovs_port( - intf_info["interface"], - intf_name, - uplink_map[intf_info["interface"]], - vlan_id=intf_info.get("vlan_tag")) + intf_info["interface"], + intf_name, + uplink_map[intf_info["interface"]], + vlan_id=intf_info.get("vlan_tag")) else: pass + def main(config): uplink_map = {} setup_bondings(config["bond_mappings"]) @@ -60,6 +67,7 @@ def main(config): if __name__ == "__main__": - os.system("service openvswitch-switch status|| service openvswitch-switch start") + os.system( + "service openvswitch-switch status|| service openvswitch-switch start") config = yaml.load(open(config_path)) main(config) diff --git a/deploy/adapters/ansible/roles/odl_cluster/files/recover_network_odl_l3.py b/deploy/adapters/ansible/roles/odl_cluster/files/recover_network_odl_l3.py index 7bef1052..ec7f7c6b 100755 --- a/deploy/adapters/ansible/roles/odl_cluster/files/recover_network_odl_l3.py +++ b/deploy/adapters/ansible/roles/odl_cluster/files/recover_network_odl_l3.py @@ -6,25 +6,29 @@ import log as logging LOG = logging.getLogger("net-recover-odl-l3") config_path = os.path.join(os.path.dirname(__file__), "network.cfg") + def setup_bondings(bond_mappings): print bond_mappings + def setup_ips_new(config): LOG.info("setup_ips_new enter") network = netaddr.IPNetwork(config["ip_settings"]["br-prv"]["cidr"]) - intf_name = config["provider_net_mappings"][0]["interface"] cmd = "ip link set br-ex up;" cmd += "ip addr add %s/%s brd %s dev %s;" \ - % (config["ip_settings"]["br-prv"]["ip"], config["ip_settings"]["br-prv"]["netmask"], str(network.broadcast), 'br-ex') + % (config["ip_settings"]["br-prv"]["ip"], config["ip_settings"]["br-prv"]["netmask"], str(network.broadcast), 'br-ex') # noqa: E501 cmd += "route del default;" - cmd += "ip route add default via %s dev %s" % (config["ip_settings"]["br-prv"]["gw"], 'br-ex') + cmd += "ip route add default via %s dev %s" % ( + config["ip_settings"]["br-prv"]["gw"], 'br-ex') LOG.info("setup_ips_new: cmd=%s" % cmd) os.system(cmd) + def main(config): - setup_ips_new(config) + setup_ips_new(config) if __name__ == "__main__": - os.system("service openvswitch-switch status|| service openvswitch-switch start") + os.system( + "service openvswitch-switch status|| service openvswitch-switch start") config = yaml.load(open(config_path)) main(config) diff --git a/deploy/adapters/ansible/roles/odl_cluster/files/setup_networks_odl_l3.py b/deploy/adapters/ansible/roles/odl_cluster/files/setup_networks_odl_l3.py index 22797413..cf8779d4 100644 --- a/deploy/adapters/ansible/roles/odl_cluster/files/setup_networks_odl_l3.py +++ b/deploy/adapters/ansible/roles/odl_cluster/files/setup_networks_odl_l3.py @@ -6,33 +6,41 @@ import log as logging LOG = logging.getLogger("net-init-l3") config_path = os.path.join(os.path.dirname(__file__), "network.cfg") + def setup_bondings(bond_mappings): print bond_mappings + def add_vlan_link(interface, ifname, vlan_id): LOG.info("add_vlan_link enter") - cmd = "ip link add link %s name %s type vlan id %s; " % (ifname, interface, vlan_id) + cmd = "ip link add link %s name %s type vlan id %s; " % ( + ifname, interface, vlan_id) cmd += "ip link set %s up; ip link set %s up" % (interface, ifname) LOG.info("add_vlan_link: cmd=%s" % cmd) os.system(cmd) -#def add_ovs_port(ovs_br, ifname, uplink, vlan_id=None): +# def add_ovs_port(ovs_br, ifname, uplink, vlan_id=None): # LOG.info("add_ovs_port enter") # cmd = "ovs-vsctl --may-exist add-port %s %s" % (ovs_br, ifname) # if vlan_id: # cmd += " tag=%s" % vlan_id # cmd += " -- set Interface %s type=internal;" % ifname -# cmd += "ip link set dev %s address `ip link show %s |awk '/link\/ether/{print $2}'`;" \ +# cmd += "ip link set dev %s address `ip link show %s |awk \ +# '/link\/ether/{print $2}'`;" \ # % (ifname, uplink) # cmd += "ip link set %s up;" % ifname # LOG.info("add_ovs_port: cmd=%s" % cmd) # os.system(cmd) + def setup_intfs(sys_intf_mappings, uplink_map): LOG.info("setup_intfs enter") for intf_name, intf_info in sys_intf_mappings.items(): if intf_info["type"] == "vlan": - add_vlan_link(intf_name, intf_info["interface"], intf_info["vlan_tag"]) + add_vlan_link( + intf_name, + intf_info["interface"], + intf_info["vlan_tag"]) # elif intf_info["type"] == "ovs": # add_ovs_port( # intf_info["interface"], @@ -42,6 +50,7 @@ def setup_intfs(sys_intf_mappings, uplink_map): else: pass + def setup_ips(ip_settings, sys_intf_mappings): LOG.info("setup_ips enter") for intf_info in ip_settings.values(): @@ -53,28 +62,34 @@ def setup_ips(ip_settings, sys_intf_mappings): if "gw" in intf_info: continue cmd = "ip addr add %s/%s brd %s dev %s;" \ - % (intf_info["ip"], intf_info["netmask"], str(network.broadcast),intf_name) + % (intf_info["ip"], intf_info["netmask"], str(network.broadcast), intf_name) # noqa: E501 # if "gw" in intf_info: # cmd += "route del default;" -# cmd += "ip route add default via %s dev %s" % (intf_info["gw"], intf_name) +# cmd += "ip route add default via %s dev %s" % (intf_info["gw"], +# intf_name) LOG.info("setup_ips: cmd=%s" % cmd) os.system(cmd) + def setup_ips_new(config): LOG.info("setup_ips_new enter") network = netaddr.IPNetwork(config["ip_settings"]["br-prv"]["cidr"]) - intf_name = config["provider_net_mappings"][0]["interface"] # cmd = "ip addr add %s/%s brd %s dev %s;" \ -# % (config["ip_settings"]["br-prv"]["ip"], config["ip_settings"]["br-prv"]["netmask"], str(network.broadcast), intf_name) +# % (config["ip_settings"]["br-prv"]["ip"], \ +# config["ip_settings"]["br-prv"]["netmask"], \ +# str(network.broadcast), intf_name) cmd = "ip link set br-ex up;" cmd += "ip addr add %s/%s brd %s dev %s;" \ - % (config["ip_settings"]["br-prv"]["ip"], config["ip_settings"]["br-prv"]["netmask"], str(network.broadcast), 'br-ex') + % (config["ip_settings"]["br-prv"]["ip"], config["ip_settings"]["br-prv"]["netmask"], str(network.broadcast), 'br-ex') # noqa: E501 cmd += "route del default;" -# cmd += "ip route add default via %s dev %s" % (config["ip_settings"]["br-prv"]["gw"], intf_name) - cmd += "ip route add default via %s dev %s" % (config["ip_settings"]["br-prv"]["gw"], 'br-ex') +# cmd += "ip route add default via %s dev %s" % +# (config["ip_settings"]["br-prv"]["gw"], intf_name) + cmd += "ip route add default via %s dev %s" % ( + config["ip_settings"]["br-prv"]["gw"], 'br-ex') LOG.info("setup_ips_new: cmd=%s" % cmd) os.system(cmd) + def main(config): uplink_map = {} setup_bondings(config["bond_mappings"]) @@ -86,6 +101,7 @@ def main(config): setup_ips_new(config) if __name__ == "__main__": - os.system("service openvswitch-switch status|| service openvswitch-switch start") + os.system( + "service openvswitch-switch status|| service openvswitch-switch start") config = yaml.load(open(config_path)) main(config) diff --git a/deploy/adapters/ansible/roles/open-contrail/files/recover_network_opencontrail.py b/deploy/adapters/ansible/roles/open-contrail/files/recover_network_opencontrail.py index e829b65c..bd40d0a4 100755 --- a/deploy/adapters/ansible/roles/open-contrail/files/recover_network_opencontrail.py +++ b/deploy/adapters/ansible/roles/open-contrail/files/recover_network_opencontrail.py @@ -6,27 +6,34 @@ import log as logging LOG = logging.getLogger("net-recover-opencontrail") config_path = os.path.join(os.path.dirname(__file__), "network.cfg") + def setup_bondings(bond_mappings): print bond_mappings + def setup_ips_new(config): LOG.info("setup_ips_new enter") network = netaddr.IPNetwork(config["ip_settings"]["br-prv"]["cidr"]) intf_name = config["provider_net_mappings"][0]["interface"] cmd = "ip addr add %s/%s brd %s dev %s;" \ - % (config["ip_settings"]["br-prv"]["ip"], config["ip_settings"]["br-prv"]["netmask"], str(network.broadcast), intf_name) - #cmd = "ip link set br-ex up;" - #cmd += "ip addr add %s/%s brd %s dev %s;" \ - # % (config["ip_settings"]["br-prv"]["ip"], config["ip_settings"]["br-prv"]["netmask"], str(network.broadcast), 'br-ex') + % (config["ip_settings"]["br-prv"]["ip"], config["ip_settings"]["br-prv"]["netmask"], str(network.broadcast), intf_name) # noqa: E501 + # cmd = "ip link set br-ex up;" + # cmd += "ip addr add %s/%s brd %s dev %s;" \ + # % (config["ip_settings"]["br-prv"]["ip"], \ + # config["ip_settings"]["br-prv"]["netmask"], \ + # str(network.broadcast), 'br-ex') cmd += "route del default;" - cmd += "ip route add default via %s dev %s" % (config["ip_settings"]["br-prv"]["gw"], intf_name) - #cmd += "ip route add default via %s dev %s" % (config["ip_settings"]["br-prv"]["gw"], 'br-ex') + cmd += "ip route add default via %s dev %s" % ( + config["ip_settings"]["br-prv"]["gw"], + intf_name) + # cmd += "ip route add default via %s dev %s" % + # (config["ip_settings"]["br-prv"]["gw"], 'br-ex') LOG.info("setup_ips_new: cmd=%s" % cmd) os.system(cmd) def main(config): - setup_ips_new(config) + setup_ips_new(config) if __name__ == "__main__": config = yaml.load(open(config_path)) diff --git a/deploy/adapters/ansible/roles/open-contrail/files/setup_networks_opencontrail.py b/deploy/adapters/ansible/roles/open-contrail/files/setup_networks_opencontrail.py index fd7795af..7544932d 100755 --- a/deploy/adapters/ansible/roles/open-contrail/files/setup_networks_opencontrail.py +++ b/deploy/adapters/ansible/roles/open-contrail/files/setup_networks_opencontrail.py @@ -6,33 +6,41 @@ import log as logging LOG = logging.getLogger("net-init-opencontrail") config_path = os.path.join(os.path.dirname(__file__), "network.cfg") + def setup_bondings(bond_mappings): print bond_mappings + def add_vlan_link(interface, ifname, vlan_id): LOG.info("add_vlan_link enter") - cmd = "ip link add link %s name %s type vlan id %s; " % (ifname, interface, vlan_id) + cmd = "ip link add link %s name %s type vlan id %s; " % ( + ifname, interface, vlan_id) cmd += "ip link set %s up; ip link set %s up" % (interface, ifname) LOG.info("add_vlan_link: cmd=%s" % cmd) os.system(cmd) -#def add_ovs_port(ovs_br, ifname, uplink, vlan_id=None): +# def add_ovs_port(ovs_br, ifname, uplink, vlan_id=None): # LOG.info("add_ovs_port enter") # cmd = "ovs-vsctl --may-exist add-port %s %s" % (ovs_br, ifname) # if vlan_id: # cmd += " tag=%s" % vlan_id # cmd += " -- set Interface %s type=internal;" % ifname -# cmd += "ip link set dev %s address `ip link show %s |awk '/link\/ether/{print $2}'`;" \ +# cmd += "ip link set dev %s address `ip link show %s |awk \ +# '/link\/ether/{print $2}'`;" \ # % (ifname, uplink) # cmd += "ip link set %s up;" % ifname # LOG.info("add_ovs_port: cmd=%s" % cmd) # os.system(cmd) + def setup_intfs(sys_intf_mappings, uplink_map): LOG.info("setup_intfs enter") for intf_name, intf_info in sys_intf_mappings.items(): if intf_info["type"] == "vlan": - add_vlan_link(intf_name, intf_info["interface"], intf_info["vlan_tag"]) + add_vlan_link( + intf_name, + intf_info["interface"], + intf_info["vlan_tag"]) # elif intf_info["type"] == "ovs": # add_ovs_port( # intf_info["interface"], @@ -42,6 +50,7 @@ def setup_intfs(sys_intf_mappings, uplink_map): else: pass + def setup_ips(ip_settings, sys_intf_mappings): LOG.info("setup_ips enter") for intf_info in ip_settings.values(): @@ -53,43 +62,52 @@ def setup_ips(ip_settings, sys_intf_mappings): if "gw" in intf_info: continue cmd = "ip addr add %s/%s brd %s dev %s;" \ - % (intf_info["ip"], intf_info["netmask"], str(network.broadcast),intf_name) + % (intf_info["ip"], intf_info["netmask"], str(network.broadcast), intf_name) # noqa: E501 # if "gw" in intf_info: # cmd += "route del default;" -# cmd += "ip route add default via %s dev %s" % (intf_info["gw"], intf_name) +# cmd += "ip route add default via %s dev %s" % (intf_info["gw"], +# intf_name) LOG.info("setup_ips: cmd=%s" % cmd) os.system(cmd) + def setup_ips_new(config): LOG.info("setup_ips_new enter") network = netaddr.IPNetwork(config["ip_settings"]["br-prv"]["cidr"]) intf_name = config["provider_net_mappings"][0]["interface"] cmd = "ip addr add %s/%s brd %s dev %s;" \ - % (config["ip_settings"]["br-prv"]["ip"], config["ip_settings"]["br-prv"]["netmask"], str(network.broadcast), intf_name) + % (config["ip_settings"]["br-prv"]["ip"], config["ip_settings"]["br-prv"]["netmask"], str(network.broadcast), intf_name) # noqa: E501 # cmd = "ip link set br-ex up;" # cmd += "ip addr add %s/%s brd %s dev %s;" \ -# % (config["ip_settings"]["br-prv"]["ip"], config["ip_settings"]["br-prv"]["netmask"], str(network.broadcast), 'br-ex') +# % (config["ip_settings"]["br-prv"]["ip"], \ +# config["ip_settings"]["br-prv"]["netmask"], \ +# str(network.broadcast), 'br-ex') cmd += "route del default;" - cmd += "ip route add default via %s dev %s" % (config["ip_settings"]["br-prv"]["gw"], intf_name) -# cmd += "ip route add default via %s dev %s" % (config["ip_settings"]["br-prv"]["gw"], 'br-ex') + cmd += "ip route add default via %s dev %s" % ( + config["ip_settings"]["br-prv"]["gw"], + intf_name) +# cmd += "ip route add default via %s dev %s" % +# (config["ip_settings"]["br-prv"]["gw"], 'br-ex') LOG.info("setup_ips_new: cmd=%s" % cmd) os.system(cmd) + def setup_default_router(config): LOG.info("setup_ips_new enter") - network = netaddr.IPNetwork(config["ip_settings"]["br-prv"]["cidr"]) - intf_name = config["provider_net_mappings"][0]["interface"] cmd = "route del default;" - cmd += "ip route add default via %s dev %s" % (config["ip_settings"]["br-prv"]["gw"], "vhost0") + cmd += "ip route add default via %s dev %s" % ( + config["ip_settings"]["br-prv"]["gw"], "vhost0") LOG.info("setup_default_router: cmd=%s" % cmd) os.system(cmd) + def remove_ovs_kernel_mod(config): LOG.info("remove_ovs_kernel_mod enter") cmd = "rmmod vport_vxlan; rmmod openvswitch;" LOG.info("remove_ovs_kernel_mod: cmd=%s" % cmd) os.system(cmd) + def main(config): uplink_map = {} setup_bondings(config["bond_mappings"]) diff --git a/deploy/adapters/ansible/roles/setup-network/files/setup_networks/check_network.py b/deploy/adapters/ansible/roles/setup-network/files/setup_networks/check_network.py index 72a5db97..a7e3b2fd 100644 --- a/deploy/adapters/ansible/roles/setup-network/files/setup_networks/check_network.py +++ b/deploy/adapters/ansible/roles/setup-network/files/setup_networks/check_network.py @@ -6,9 +6,14 @@ import log as logging LOG = logging.getLogger("net-check") + def is_ip_reachable(ip): cmd = "ping -c 2 %s" % ip - process = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=None, shell=True) + process = subprocess.Popen( + cmd, + stdout=subprocess.PIPE, + stderr=None, + shell=True) output = process.communicate()[0] if " 0% packet loss" in output: @@ -21,6 +26,7 @@ def is_ip_reachable(ip): return True + def is_host_ips_reachable(settings): external = settings["br-prv"]["ip"] external_gw = settings["br-prv"]["gw"] @@ -28,9 +34,10 @@ def is_host_ips_reachable(settings): mgmt = settings["mgmt"]["ip"] return is_ip_reachable(external) \ - and is_ip_reachable(external_gw) \ - and is_ip_reachable(storage) \ - and is_ip_reachable(mgmt) + and is_ip_reachable(external_gw) \ + and is_ip_reachable(storage) \ + and is_ip_reachable(mgmt) + def main(hostname, config): LOG.info("host is %s", hostname) @@ -53,4 +60,3 @@ if __name__ == "__main__": config.pop(hostname, None) main(hostname, config) - diff --git a/deploy/adapters/ansible/roles/setup-network/files/setup_networks/log.py b/deploy/adapters/ansible/roles/setup-network/files/setup_networks/log.py index fffeb589..a22ff0fe 100644 --- a/deploy/adapters/ansible/roles/setup-network/files/setup_networks/log.py +++ b/deploy/adapters/ansible/roles/setup-network/files/setup_networks/log.py @@ -1,12 +1,13 @@ import logging import os loggers = {} -log_dir="/var/log/setup_network" +log_dir = "/var/log/setup_network" try: os.makedirs(log_dir) except: pass + def getLogger(name): if name in loggers: return loggers[name] @@ -29,7 +30,8 @@ def getLogger(name): ch.setLevel(logging.ERROR) # create formatter and add it to the handlers - formatter = logging.Formatter("%(asctime)s - %(name)s - %(levelname)s - %(message)s") + formatter = logging.Formatter( + "%(asctime)s - %(name)s - %(levelname)s - %(message)s") ch.setFormatter(formatter) fh.setFormatter(formatter) diff --git a/deploy/adapters/ansible/roles/setup-network/files/setup_networks/setup_networks.py b/deploy/adapters/ansible/roles/setup-network/files/setup_networks/setup_networks.py index e58d6c72..a25d7ea9 100644 --- a/deploy/adapters/ansible/roles/setup-network/files/setup_networks/setup_networks.py +++ b/deploy/adapters/ansible/roles/setup-network/files/setup_networks/setup_networks.py @@ -6,42 +6,52 @@ import log as logging LOG = logging.getLogger("net-init") config_path = os.path.join(os.path.dirname(__file__), "network.cfg") + def setup_bondings(bond_mappings): print bond_mappings + def add_vlan_link(interface, ifname, vlan_id): LOG.info("add_vlan_link enter") - cmd = "ip link add link %s name %s type vlan id %s; " % (ifname, interface, vlan_id) + cmd = "ip link add link %s name %s type vlan id %s; " % ( + ifname, interface, vlan_id) cmd += "ip link set %s up; ip link set %s up" % (interface, ifname) LOG.info("add_vlan_link: cmd=%s" % cmd) os.system(cmd) + def add_ovs_port(ovs_br, ifname, uplink, vlan_id=None): LOG.info("add_ovs_port enter") cmd = "ovs-vsctl --may-exist add-port %s %s" % (ovs_br, ifname) if vlan_id: cmd += " tag=%s" % vlan_id cmd += " -- set Interface %s type=internal;" % ifname - cmd += "ip link set dev %s address `ip link show %s |awk '/link\/ether/{print $2}'`;" \ - % (ifname, uplink) + cmd += "ip link set dev %s address `ip link show %s |awk \ + '/link\/ether/{print $2}'`;" \ + % (ifname, uplink) cmd += "ip link set %s up;" % ifname LOG.info("add_ovs_port: cmd=%s" % cmd) os.system(cmd) + def setup_intfs(sys_intf_mappings, uplink_map): LOG.info("setup_intfs enter") for intf_name, intf_info in sys_intf_mappings.items(): if intf_info["type"] == "vlan": - add_vlan_link(intf_name, intf_info["interface"], intf_info["vlan_tag"]) + add_vlan_link( + intf_name, + intf_info["interface"], + intf_info["vlan_tag"]) elif intf_info["type"] == "ovs": add_ovs_port( - intf_info["interface"], - intf_name, - uplink_map[intf_info["interface"]], - vlan_id=intf_info.get("vlan_tag")) + intf_info["interface"], + intf_name, + uplink_map[intf_info["interface"]], + vlan_id=intf_info.get("vlan_tag")) else: pass + def setup_ips(ip_settings, sys_intf_mappings): LOG.info("setup_ips enter") for intf_info in ip_settings.values(): @@ -51,13 +61,15 @@ def setup_ips(ip_settings, sys_intf_mappings): else: intf_name = intf_info["alias"] cmd = "ip addr add %s/%s brd %s dev %s;" \ - % (intf_info["ip"], intf_info["netmask"], str(network.broadcast),intf_name) + % (intf_info["ip"], intf_info["netmask"], str(network.broadcast), intf_name) # noqa: E501 if "gw" in intf_info: cmd += "route del default;" - cmd += "ip route add default via %s dev %s" % (intf_info["gw"], intf_name) + cmd += "ip route add default via %s dev %s" % ( + intf_info["gw"], intf_name) LOG.info("setup_ips: cmd=%s" % cmd) os.system(cmd) + def main(config): uplink_map = {} setup_bondings(config["bond_mappings"]) @@ -68,6 +80,7 @@ def main(config): setup_ips(config["ip_settings"], config["sys_intf_mappings"]) if __name__ == "__main__": - os.system("service openvswitch-switch status|| service openvswitch-switch start") + os.system( + "service openvswitch-switch status|| service openvswitch-switch start") config = yaml.load(open(config_path)) main(config) |