From 6b2eccf0350f7f053e18ea2ac190489b00960809 Mon Sep 17 00:00:00 2001 From: meimei Date: Tue, 29 Nov 2016 18:05:01 +0800 Subject: Improve compass ci verification, clear all the warnnings JIRA: COMPASS-494 MODIFY BY HAOJINGBO Change-Id: I2b95d84157c860254b3b3f68f7b2a54393caf8f4 Signed-off-by: meimei --- .../odl_cluster/files/setup_networks_odl_l3.py | 40 +++++++++++++++------- 1 file changed, 28 insertions(+), 12 deletions(-) (limited to 'deploy/adapters/ansible/roles/odl_cluster/files/setup_networks_odl_l3.py') 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) -- cgit 1.2.3-korg