summaryrefslogtreecommitdiffstats
path: root/deploy/adapters/ansible/roles/odl_cluster/files
diff options
context:
space:
mode:
authorKingPoo <haojingbo@huawei.com>2016-11-09 22:39:01 -0500
committerKingPoo <haojingbo@huawei.com>2016-11-09 22:39:01 -0500
commit404fcf8f737f405da7fd2e61441dd20a57d63935 (patch)
treebe6f2214774edb1c803303eede8e810028a7584d /deploy/adapters/ansible/roles/odl_cluster/files
parent5f7e61eb5419681359af3ff3e37fac2b771a5c08 (diff)
autopep8 make py files more standard
Change-Id: Ibaa74a1f508b28548668e764d1860393caa356d4 Signed-off-by: KingPoo <haojingbo@huawei.com>
Diffstat (limited to 'deploy/adapters/ansible/roles/odl_cluster/files')
-rwxr-xr-xdeploy/adapters/ansible/roles/odl_cluster/files/recover_network.py20
-rwxr-xr-xdeploy/adapters/ansible/roles/odl_cluster/files/recover_network_odl_l3.py10
-rw-r--r--deploy/adapters/ansible/roles/odl_cluster/files/setup_networks_odl_l3.py23
3 files changed, 37 insertions, 16 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..2d793880 100755
--- a/deploy/adapters/ansible/roles/odl_cluster/files/recover_network.py
+++ b/deploy/adapters/ansible/roles/odl_cluster/files/recover_network.py
@@ -6,9 +6,11 @@ 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)
@@ -16,11 +18,12 @@ def add_ovs_port(ovs_br, ifname, uplink, vlan_id=None):
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)
+ % (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 +34,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)
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"])
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..48b4d48c 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,23 +6,27 @@ 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')
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")
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..08e3fbf1 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,17 +6,20 @@ 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:
@@ -28,11 +31,15 @@ def add_vlan_link(interface, ifname, vlan_id):
# 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 +49,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,13 +61,14 @@ 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)
# if "gw" in intf_info:
# cmd += "route del default;"
# 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"])
@@ -68,13 +77,15 @@ def setup_ips_new(config):
# % (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')
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"], 'br-ex')
LOG.info("setup_ips_new: cmd=%s" % cmd)
os.system(cmd)
+
def main(config):
uplink_map = {}
setup_bondings(config["bond_mappings"])