X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=deploy%2Freap.py;h=be729181fcf92ea5f5d44a9de82623dd6429f0d9;hb=00bf737316a29867a1fcc38753418d6e2fff9f27;hp=ed5bc994e409a8bf1846a224f65a79715b422b1e;hpb=7994abe6083f408823149669fa2e51ef7d341a8e;p=fuel.git diff --git a/deploy/reap.py b/deploy/reap.py index ed5bc994e..be729181f 100644 --- a/deploy/reap.py +++ b/deploy/reap.py @@ -1,7 +1,8 @@ #!/usr/bin/python ############################################################################### -# Copyright (c) 2015 Ericsson AB and others. +# Copyright (c) 2015, 2016 Ericsson AB and others. # szilard.cserey@ericsson.com +# peter.barabas@ericsson.com # All rights reserved. This program and the accompanying materials # are made available under the terms of the Apache License, Version 2.0 # which accompanies this distribution, and is available at @@ -15,6 +16,9 @@ import yaml import glob import shutil import tempfile +import re +import netaddr +import templater from common import ( N, @@ -83,10 +87,12 @@ DISKS = {'fuel': '100G', class Reap(object): - def __init__(self, dea_file, dha_file, comment): + def __init__(self, dea_file, dha_file, comment, base_dea, template): self.dea_file = dea_file self.dha_file = dha_file self.comment = comment + self.base_dea = base_dea + self.template = template self.temp_dir = None self.env = None self.env_id = None @@ -161,17 +167,18 @@ class Reap(object): def reap_nodes_interfaces_transformations(self): node_list = parse(exec_cmd('fuel node')) real_node_ids = [node[N['id']] for node in node_list] + real_node_ids = map(int, real_node_ids) real_node_ids.sort() - min_node = real_node_ids[0] + min_node = min(real_node_ids) interfaces = {} transformations = {} dea_nodes = [] dha_nodes = [] for real_node_id in real_node_ids: - node_id = int(real_node_id) - int(min_node) + 1 + node_id = real_node_id - min_node + 1 self.last_node = node_id - node = self.get_node_by_id(node_list, real_node_id) + node = self.get_node_by_id(node_list, str(real_node_id)) roles = commafy(node[N['roles']]) if not roles: err('Fuel Node %s has no role' % real_node_id) @@ -248,6 +255,40 @@ class Reap(object): if key not in ['ipaddress', 'netmask', 'dhcp_pool_start', 'dhcp_pool_end', 'ssh_network']: del fuel['ADMIN_NETWORK'][key] + + ## FIXME(armband): Factor in support for adding public/other interfaces. + ## TODO: Following block expects interface name(s) to be lowercase only + interfaces_list = exec_cmd('ip -o -4 a | grep -e "e[nt][hopsx].*"') + for interface in re.split('\n', interfaces_list): + # Sample output line from above cmd: + # 3: eth1 inet 10.0.2.10/24 scope global eth1 valid_lft forever ... + ifcfg = re.split(r'\s+', interface) + ifcfg_name = ifcfg[1] + ifcfg_ipaddr = ifcfg[3] + + # Filter out admin interface (device name is not known, match IP) + current_network = netaddr.IPNetwork(ifcfg_ipaddr) + if str(current_network.ip) == fuel['ADMIN_NETWORK']['ipaddress']: + continue + + # Read ifcfg-* network interface config file, write IFCFG_ + ifcfg_sec = 'IFCFG_%s' % ifcfg_name.upper() + fuel[ifcfg_sec] = {} + ifcfg_data = {} + ifcfg_f = ('/etc/sysconfig/network-scripts/ifcfg-%s' % ifcfg_name) + with open(ifcfg_f) as f: + for line in f: + if line.startswith('#'): + continue + (key, val) = line.split('=') + ifcfg_data[key.lower()] = val.rstrip() + + # Keep only needed info (e.g. filter-out type=Ethernet). + fuel[ifcfg_sec]['ipaddress'] = ifcfg_data['ipaddr'] + fuel[ifcfg_sec]['device'] = ifcfg_data['device'] + fuel[ifcfg_sec]['netmask'] = str(current_network.netmask) + fuel[ifcfg_sec]['gateway'] = ifcfg_data['gateway'] + self.write_yaml(self.dea_file, {'fuel': fuel}) def reap_network_settings(self): @@ -293,6 +334,7 @@ class Reap(object): def intro(self): delete(self.dea_file) delete(self.dha_file) + self.temp_dir = tempfile.mkdtemp() date = time.strftime('%c') self.write(self.dea_file, @@ -310,10 +352,18 @@ class Reap(object): self.download_config('settings') self.download_config('network') + def create_base_dea(self): + templater = templater.Templater(self.dea_file, + self.template, + self.base_dea) + templater.run() + def finale(self): log('DEA file is available at %s' % self.dea_file) log('DHA file is available at %s (this is just a template)' % self.dha_file) + if self.base_dea: + log('DEA base file is available at %s' % self.base_dea) shutil.rmtree(self.temp_dir) def reap(self): @@ -323,6 +373,8 @@ class Reap(object): self.reap_fuel_settings() self.reap_network_settings() self.reap_settings() + if self.base_dea: + self.create_base_dea() self.finale() @@ -335,14 +387,26 @@ def parse_arguments(): default='dha.yaml', help='Deployment Hardware Adapter: dha.yaml') parser.add_argument('comment', nargs='?', action='store', help='Comment') + parser.add_argument('-base_dea', + dest='base_dea', + help='Create specified base DEA file from "dea_file"') + parser.add_argument('-template', + dest='template', + nargs='?', + default='base_dea_template.yaml', + help='Base DEA is generated from this template') args = parser.parse_args() - return (args.dea_file, args.dha_file, args.comment) + return (args.dea_file, + args.dha_file, + args.comment, + args.base_dea, + args.template) def main(): - dea_file, dha_file, comment = parse_arguments() + dea_file, dha_file, comment, base_dea, template = parse_arguments() - r = Reap(dea_file, dha_file, comment) + r = Reap(dea_file, dha_file, comment, base_dea, template) r.reap()