summaryrefslogtreecommitdiffstats
path: root/deploy/adapters/ansible/openstack_osp9
diff options
context:
space:
mode:
Diffstat (limited to 'deploy/adapters/ansible/openstack_osp9')
-rwxr-xr-xdeploy/adapters/ansible/openstack_osp9/roles/onos_cluster/files/setup_networks/log.py6
-rwxr-xr-xdeploy/adapters/ansible/openstack_osp9/roles/onos_cluster/files/setup_networks/setup_networks.py29
2 files changed, 24 insertions, 11 deletions
diff --git a/deploy/adapters/ansible/openstack_osp9/roles/onos_cluster/files/setup_networks/log.py b/deploy/adapters/ansible/openstack_osp9/roles/onos_cluster/files/setup_networks/log.py
index fffeb589..a22ff0fe 100755
--- a/deploy/adapters/ansible/openstack_osp9/roles/onos_cluster/files/setup_networks/log.py
+++ b/deploy/adapters/ansible/openstack_osp9/roles/onos_cluster/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/openstack_osp9/roles/onos_cluster/files/setup_networks/setup_networks.py b/deploy/adapters/ansible/openstack_osp9/roles/onos_cluster/files/setup_networks/setup_networks.py
index e58d6c72..cdd4ae0d 100755
--- a/deploy/adapters/ansible/openstack_osp9/roles/onos_cluster/files/setup_networks/setup_networks.py
+++ b/deploy/adapters/ansible/openstack_osp9/roles/onos_cluster/files/setup_networks/setup_networks.py
@@ -6,16 +6,20 @@ 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)
@@ -23,25 +27,30 @@ 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_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 +60,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)
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"])