X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_openvim%2Fovim.py;h=852196499d1e6177f2a891343bd4e315549af889;hb=refs%2Fchanges%2F50%2F5850%2F4;hp=dc21e2d0375f81d73ab786aeca54f86fb5993291;hpb=42ca00981cfa569e26fcca537e4c1e18d32653b1;p=osm%2Fopenvim.git diff --git a/osm_openvim/ovim.py b/osm_openvim/ovim.py index dc21e2d..8521964 100755 --- a/osm_openvim/ovim.py +++ b/osm_openvim/ovim.py @@ -28,6 +28,7 @@ Two thread will be launched, with normal and administrative permissions. """ import threading +import yaml import vim_db import logging # import imp @@ -42,9 +43,9 @@ import openflow_conn __author__ = "Alfonso Tierno, Leonardo Mirabal" __date__ = "$06-Feb-2017 12:07:15$" -__version__ = "0.5.17-r533" -version_date = "Jun 2017" -database_version = 20 #needed database schema version +__version__ = "0.5.24-r542" +version_date = "Mar 2018" +database_version = 23 #needed database schema version HTTP_Bad_Request = 400 HTTP_Unauthorized = 401 @@ -146,7 +147,7 @@ class ovim(): if "dhcp_last_ip" not in network: network["dhcp_last_ip"] = str(ips[-2]) if "gateway_ip" not in network: - network["gateway_ip"] = str(ips[2]) + network["gateway_ip"] = str(ips[1]) return True else: @@ -198,8 +199,8 @@ class ovim(): host_develop_bridge_iface = self.config.get('development_bridge', None) # get host list from data base before starting threads - r, hosts = self.db.get_table(SELECT=('name', 'ip_name', 'user', 'uuid', 'password', 'keyfile'), - FROM='hosts', WHERE={'status': 'ok'}) + r, hosts = self.db.get_table(SELECT=('name', 'ip_name', 'user', 'uuid', 'hypervisors', 'password', 'keyfile'), + FROM='hosts', WHERE={'status': 'ok'}) #Unikernels extension if r < 0: raise ovimException("Cannot get hosts from database {}".format(hosts)) @@ -214,6 +215,7 @@ class ovim(): version=self.config['version'], host_id=host['uuid'], develop_mode=host_develop_mode, develop_bridge_iface=host_develop_bridge_iface, + hypervisors=host['hypervisors'], #Unikernels extension logger_name=self.logger_name + ".host." + host['name'], debug=self.config.get('log_level_host')) @@ -222,7 +224,7 @@ class ovim(): except Exception as e: self.logger.critical('Error detected for compute = {} with ip = {}' .format(host['name'], host['ip_name'])) - + thread.start() self.config['host_threads'][host['uuid']] = thread # precreate interfaces; [bridge:, VLAN used at Host, uuid of network camping in this bridge, @@ -282,20 +284,42 @@ class ovim(): for net in content: net_type = net['type'] - if (net_type == 'bridge_data' or net_type == 'bridge_man') and \ + if net['status'] != "INACTIVE" and (net_type == 'bridge_data' or net_type == 'bridge_man') and \ net["provider"][:4] == 'OVS:' and net["enable_dhcp"] == "true": try: - self.launch_dhcp_server(net['vlan'], - net['dhcp_first_ip'], - net['dhcp_last_ip'], - net['cidr'], - net['gateway_ip']) + config_routes = net.get('routes') + if config_routes: + routes = yaml.safe_load(config_routes) + else: + routes = None + + config_dns = net.get('dns') + if config_dns: + dns = yaml.safe_load(config_dns) + else: + dns = None + + links = net.get('links') + if links: + links = yaml.safe_load(net.get('links')) + if net.get('enable_dhcp'): + self.launch_dhcp_server(net.get('vlan'), + net.get('dhcp_first_ip'), + net.get('dhcp_last_ip'), + net.get('cidr'), + net.get('gateway_ip'), + dns, + routes) + self.launch_link_bridge_to_ovs(net['vlan'], net.get('gateway_ip'), net.get('cidr'), links, routes) + if net["status"] == "ERROR": + self.db.update_rows("nets", UPDATE={"status": "ACTIVE", "last_error": None}, + WHERE={"uuid": net["uuid"]}) except Exception as e: self.logger.error("Fail at launching dhcp server for net_id='%s' net_name='%s': %s", net["uuid"], net["name"], str(e)) - self.db.update_rows("nets", {"status": "ERROR", + self.db.update_rows("nets", UPDATE={"status": "ERROR", "last_error": "Fail at launching dhcp server: " + str(e)}, - {"uuid": net["uuid"]}) + WHERE={"uuid": net["uuid"]}) def _start_of_db_tasks(self): """ @@ -638,12 +662,18 @@ class ovim(): network['vlan'] = net_vlan network['region'] = net_region dhcp_integrity = True - if 'enable_dhcp' in network and network['enable_dhcp']: + if network.get('enable_dhcp'): dhcp_integrity = self._check_dhcp_data_integrity(network) + + if network.get('links'): + network['links'] = yaml.safe_dump(network['links'], default_flow_style=True, width=256) + if network.get('dns'): + network['dns'] = yaml.safe_dump(network['dns'], default_flow_style=True, width=256) + if network.get('routes'): + network['routes'] = yaml.safe_dump(network['routes'], default_flow_style=True, width=256) result, content = self.db.new_row('nets', network, True, True) - - if result >= 0 and dhcp_integrity: + if result >= 0: # and dhcp_integrity: if bridge_net: bridge_net[3] = content if self.config.get("dhcp_server") and self.config['network_type'] == 'bridge': @@ -655,7 +685,8 @@ class ovim(): self.logger.debug("dhcp_server: add new net", content, content) return content else: - raise ovimException("Error posting network", HTTP_Internal_Server_Error) + raise ovimException("Error creating network: {}".format(content), -result) + # TODO kei change update->edit def edit_network(self, network_id, network): @@ -755,6 +786,7 @@ class ovim(): :param network_id: network id :return: """ + net_data = self.show_network(network_id) # delete from the data base result, content = self.db.delete_row('nets', network_id) @@ -768,7 +800,18 @@ class ovim(): break if self.config.get("dhcp_server") and network_id in self.config["dhcp_nets"]: self.config["dhcp_nets"].remove(network_id) - return content + + if net_data.get('enable_dhcp'): + dhcp_path = self.config['ovs_controller_file_path'] + dhcp_controller = self.get_dhcp_controller() + dhcp_controller.delete_dhcp_server(net_data['vlan'], network_id, dhcp_path) + dhcp_controller.delete_dhcp_port(net_data['vlan'], network_id, dhcp_path) + links = yaml.load(net_data.get('links')) + if links: + links = yaml.load(net_data.get('links')) + self.delete_link_bridge_to_ovs(net_data['vlan'], links) + + return content else: raise ovimException("Error deleting network '{}': {}".format(network_id, content), -result) @@ -1320,6 +1363,8 @@ class ovim(): map['switch_dpid'] = switch_dpid if region: map['region'] = region + if map.get("pci"): + map["pci"] = map["pci"].lower() for of_map in of_maps: result, uuid = self.db.new_row('of_port_mappings', of_map, True) @@ -1392,7 +1437,7 @@ class ovim(): return dhcp_host - def launch_dhcp_server(self, vlan, first_ip, last_ip, cidr, gateway): + def launch_dhcp_server(self, vlan, first_ip, last_ip, cidr, gateway, dns, routes): """ Launch a dhcpserver base on dnsmasq attached to the net base on vlan id across the the openvim computes :param vlan: vlan identifier @@ -1409,9 +1454,49 @@ class ovim(): dhcp_path = self.config['ovs_controller_file_path'] controller_host = self.get_dhcp_controller() - controller_host.create_linux_bridge(vlan) - controller_host.create_dhcp_interfaces(vlan, gateway, dhcp_netmask) - controller_host.launch_dhcp_server(vlan, ip_range, dhcp_netmask, dhcp_path, gateway) + + # controller_host.create_linux_bridge(vlan) + controller_host.create_dhcp_interfaces(vlan, first_ip, dhcp_netmask) + dhcp_path = self.config['ovs_controller_file_path'] + controller_host.launch_dhcp_server(vlan, ip_range, dhcp_netmask, dhcp_path, gateway, dns, routes) + + def launch_link_bridge_to_ovs(self, vlan, gateway, dhcp_cidr, links=None, routes=None): + """ + Launch creating of connections (veth) between user bridge (link) and OVS + :param vlan: + :param gateway: + :param links: + :return: + """ + + if links: + controller_host = self.get_dhcp_controller() + for link in links: + if 'iface' in link and 'nat' not in link: + controller_host.create_link_bridge_to_ovs(vlan, link['iface']) + elif 'nat' in link: + controller_host.create_qrouter_ovs_connection(vlan, gateway, dhcp_cidr) + controller_host.create_qrouter_br_connection(vlan, dhcp_cidr, link) + + if len(routes): + controller_host.add_ns_routes(vlan, routes) + + def delete_link_bridge_to_ovs(self, vlan, links=None): + """ + Delete connections (veth) between user bridge (link) and OVS + :param vlan: + :param links: + :return: + """ + if links: + controller_host = self.get_dhcp_controller() + + for link in links: + if 'iface' in link and 'nat' not in link: + controller_host.remove_link_bridge_to_ovs(vlan, link['iface']) + elif 'nat' in link: + controller_host.delete_qrouter_connection(vlan, link['iface']) + if __name__ == "__main__":