X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_openvim%2Fhttpserver.py;h=4437d96ecf6abf34d17b96d61acf2aa5212447e3;hb=c67abe2ff35fcdd5b85db97915a7833ab31beb56;hp=7126e212023ef195142b9bb52395b9c17bf2dd46;hpb=42ca00981cfa569e26fcca537e4c1e18d32653b1;p=osm%2Fopenvim.git diff --git a/osm_openvim/httpserver.py b/osm_openvim/httpserver.py index 7126e21..4437d96 100644 --- a/osm_openvim/httpserver.py +++ b/osm_openvim/httpserver.py @@ -38,6 +38,7 @@ import datetime import hashlib import os import imp +import socket from netaddr import IPNetwork, IPAddress, all_matching_cidrs #import only if needed because not needed in test mode. To allow an easier installation import RADclass from jsonschema import validate as js_v, exceptions as js_e @@ -157,15 +158,25 @@ http2db_network={'id':'uuid','provider:vlan':'vlan', 'provider:physical': 'provi http2db_ofc = {'id': 'uuid'} http2db_port={'id':'uuid', 'network_id':'net_id', 'mac_address':'mac', 'device_owner':'type','device_id':'instance_id','binding:switch_port':'switch_port','binding:vlan':'vlan', 'bandwidth':'Mbps'} + def remove_extra_items(data, schema): + import re + deleted=[] if type(data) is tuple or type(data) is list: for d in data: a= remove_extra_items(d, schema['items']) if a is not None: deleted.append(a) elif type(data) is dict: + for k in data.keys(): - if 'properties' not in schema or k not in schema['properties'].keys(): + if 'patternProperties' in schema and k not in schema['properties'].keys(): + reg_ex_list = schema['patternProperties'].keys() + for reg_ex in reg_ex_list: + if not re.match(reg_ex, k): + del data[k] + deleted.append(k) + elif 'properties' not in schema or k not in schema['properties'].keys(): # or k not in schema['patternProperties'].keys(): del data[k] deleted.append(k) else: @@ -174,7 +185,8 @@ def remove_extra_items(data, schema): if len(deleted) == 0: return None elif len(deleted) == 1: return deleted[0] else: return deleted - + + def delete_nulls(var): if type(var) is dict: for k in var.keys(): @@ -626,6 +638,11 @@ def http_post_hosts(): for numa in host.get("numas", ()): if "hugepages_consumed" in numa: del numa["hugepages_consumed"] + for core in numa.get("cores", ()): + if "instance_id" in core: + del core["instance_id"] + if "v_thread_id" in core: + del core["v_thread_id"] result, content = my.db.new_host(host) if result >= 0: if content['admin_state_up']: @@ -648,8 +665,8 @@ def http_post_hosts(): # create bridge create_dhcp_ovs_bridge() config_dic['host_threads'][content['uuid']].insert_task("new-ovsbridge") - # check if more host exist - create_vxlan_mesh(content['uuid']) + # create vlxan bwt OVS controller and computes + create_vxlan_mesh(content['uuid'], my.logger) # return host data change_keys_http2db(content, http2db_host, reverse=True) @@ -674,8 +691,8 @@ def delete_dhcp_ovs_bridge(vlan, net_uuid): http_controller = config_dic['http_threads'][threading.current_thread().name] dhcp_controller = http_controller.ovim.get_dhcp_controller() - dhcp_controller.delete_dhcp_port(vlan, net_uuid) dhcp_controller.delete_dhcp_server(vlan, net_uuid, dhcp_path) + dhcp_controller.delete_dhcp_port(vlan, net_uuid) def create_dhcp_ovs_bridge(): @@ -713,7 +730,7 @@ def set_mac_dhcp(vm_ip, vlan, first_ip, last_ip, cidr, mac): http_controller = config_dic['http_threads'][threading.current_thread().name] dhcp_controller = http_controller.ovim.get_dhcp_controller() - dhcp_controller.set_mac_dhcp_server(vm_ip, mac, vlan, dhcp_netmask, dhcp_path) + dhcp_controller.set_mac_dhcp_server(vm_ip, mac, vlan, dhcp_netmask, first_ip, dhcp_path) def delete_mac_dhcp(vm_ip, vlan, mac): @@ -733,12 +750,12 @@ def delete_mac_dhcp(vm_ip, vlan, mac): dhcp_controller.delete_mac_dhcp_server(vm_ip, mac, vlan, dhcp_path) -def create_vxlan_mesh(host_id): +def create_vxlan_mesh(host_id, logger=None): """ Create vxlan mesh across all openvimc controller and computes. - :param host_id: host identifier - :param host_id: host identifier - :return: + :param host_id: Added compute node id. Anyway vlan is created by all compute nodes + :param logger: To log errors + :return: None """ dhcp_compute_name = get_vxlan_interface("dhcp") existing_hosts = get_hosts() @@ -750,22 +767,27 @@ def create_vxlan_mesh(host_id): dhcp_controller = http_controller.ovim.get_dhcp_controller() for compute in computes_available: + try: + if compute['ip_name'] != 'localhost': + remote_ip = socket.gethostbyname(compute['ip_name']) + else: + remote_ip = 'localhost' + except socket.error as e: + if logger: + logger.error("Cannot get compute node remote ip from '{}'. Skipping: {}".format( + compute['ip_name'], e)) + continue + # vxlan ovs_controller <=> compute node vxlan_interface_name = get_vxlan_interface(compute['id'][:8]) config_dic['host_threads'][compute['id']].insert_task("new-vxlan", dhcp_compute_name, dhcp_controller.host) - dhcp_controller.create_ovs_vxlan_tunnel(vxlan_interface_name, compute['ip_name']) - - # vlxan mesh creation between openvim computes - for count, compute_owner in enumerate(computes_available): - for compute in computes_available: - if compute_owner['id'] == compute['id']: - pass - else: - vxlan_interface_name = get_vxlan_interface(compute_owner['id'][:8]) - dhcp_controller.create_ovs_vxlan_tunnel(vxlan_interface_name, compute_owner['ip_name']) - config_dic['host_threads'][compute['id']].insert_task("new-vxlan", - vxlan_interface_name, - compute_owner['ip_name']) - + dhcp_controller.create_ovs_vxlan_tunnel(vxlan_interface_name, remote_ip) + # vxlan from others compute node to cthis ompute node + for compute_src in computes_available: + if compute_src['id'] == compute['id']: + continue + config_dic['host_threads'][compute_src['id']].insert_task("new-vxlan", + vxlan_interface_name, + remote_ip) def delete_vxlan_mesh(host_id): """ @@ -836,7 +858,7 @@ def http_put_host_id(host_id): if config_dic['network_type'] == 'ovs': # create mesh with new host data config_dic['host_threads'][host_id].insert_task("new-ovsbridge") - create_vxlan_mesh(host_id) + create_vxlan_mesh(host_id, my.logger) #print data return format_out(data) @@ -1614,7 +1636,7 @@ def http_post_server_id(tenant_id): if net['type'] == 'instance:ovs': dhcp_nets_id.append(get_network_id(net['net_id'])) - ports_to_free=[] + ports_to_free = [] new_instance_result, new_instance = my.db.new_instance(content, nets, ports_to_free) if new_instance_result < 0: print "Error http_post_servers() :", new_instance_result, new_instance @@ -1623,6 +1645,8 @@ def http_post_server_id(tenant_id): print print "inserted at DB" print + + for port in ports_to_free: r,c = config_dic['host_threads'][ server['host_id'] ].insert_task( 'restore-iface',*port ) if r < 0: @@ -1652,14 +1676,24 @@ def http_post_server_id(tenant_id): dhcp_enable = bool(server_net['network']['enable_dhcp']) vm_dhcp_ip = c2[0]["ip_address"] config_dic['host_threads'][server['host_id']].insert_task("create-ovs-bridge-port", vlan) + + dns = yaml.safe_load(server_net['network'].get("dns")) + routes = yaml.safe_load(server_net['network'].get("routes")) + links = yaml.safe_load(server_net['network'].get("links")) if dhcp_enable: dhcp_firt_ip = str(server_net['network']['dhcp_first_ip']) dhcp_last_ip = str(server_net['network']['dhcp_last_ip']) dhcp_cidr = str(server_net['network']['cidr']) gateway = str(server_net['network']['gateway_ip']) - set_mac_dhcp(vm_dhcp_ip, vlan, dhcp_firt_ip, dhcp_last_ip, dhcp_cidr, c2[0]['mac']) + http_controller = config_dic['http_threads'][threading.current_thread().name] - http_controller.ovim.launch_dhcp_server(vlan, dhcp_firt_ip, dhcp_last_ip, dhcp_cidr, gateway) + http_controller.ovim.launch_dhcp_server(vlan, dhcp_firt_ip, dhcp_last_ip, + dhcp_cidr, gateway, dns, routes) + set_mac_dhcp(vm_dhcp_ip, vlan, dhcp_firt_ip, dhcp_last_ip, dhcp_cidr, c2[0]['mac']) + + if links: + http_controller.ovim.launch_link_bridge_to_ovs(vlan, gateway, dhcp_cidr, links, routes) + #Start server server['uuid'] = new_instance @@ -1679,6 +1713,7 @@ def http_post_server_id(tenant_id): bottle.abort(HTTP_Bad_Request, content) return + def http_server_action(server_id, tenant_id, action): '''Perform actions over a server as resume, reboot, terminate, ...''' my = config_dic['http_threads'][ threading.current_thread().name ] @@ -1830,14 +1865,22 @@ def http_server_action(server_id, tenant_id, action): #print "dhcp insert del task" if r < 0: print ':http_post_servers ERROR UPDATING dhcp_server !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!' + c - # delete ovs-port and linux bridge, contains a list of tuple (net_id,vlan) + # delete ovs-port and linux bridge, contains a list of tuple (net_id,vlan, vm_ip, mac) + for net in net_ovs_list: mac = str(net[3]) vm_ip = str(net[2]) vlan = str(net[1]) net_id = net[0] + delete_dhcp_ovs_bridge(vlan, net_id) delete_mac_dhcp(vm_ip, vlan, mac) + + net_data = my.ovim.show_network(net_id) + if net_data.get('links'): + links = yaml.load(net_data.get('links')) + my.ovim.delete_link_bridge_to_ovs(vlan, links) + config_dic['host_threads'][server['host_id']].insert_task('del-ovs-port', vlan, net_id) if warn_text: data["result"] += warn_text @@ -1956,7 +1999,7 @@ def http_post_networks(): try: # parse input data - http_content = format_in(network_new_schema ) + http_content = format_in(network_new_schema) r = remove_extra_items(http_content, network_new_schema) if r is not None: print "http_post_networks: Warning: remove extra items ", r