X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_openvim%2Fhttpserver.py;h=aa23d8963f7935ba4ca2b33e439463bd1a5b9025;hb=caeb224da9840534e46ae0e8f5e194575521c668;hp=43d11cf67b7ad2e52d51a68d12c286c4137b36c1;hpb=a69330400c877adb0e5af22e2bf113941f808668;p=osm%2Fopenvim.git diff --git a/osm_openvim/httpserver.py b/osm_openvim/httpserver.py index 43d11cf..aa23d89 100644 --- a/osm_openvim/httpserver.py +++ b/osm_openvim/httpserver.py @@ -150,7 +150,7 @@ def check_extended(extended, allow_net_attach=False): http2db_id={'id':'uuid'} http2db_host={'id':'uuid'} http2db_tenant={'id':'uuid'} -http2db_flavor={'id':'uuid','imageRef':'image_id'} +http2db_flavor={'id':'uuid','imageRef':'image_id', 'size': 'image_size'} http2db_image={'id':'uuid', 'created':'created_at', 'updated':'modified_at', 'public': 'public'} http2db_server={'id':'uuid','hostId':'host_id','flavorRef':'flavor_id','imageRef':'image_id','created':'created_at'} http2db_network={'id':'uuid','provider:vlan':'vlan', 'provider:physical': 'provider'} @@ -1649,14 +1649,13 @@ def http_post_server_id(tenant_id): if server_net["network"].get('provider:physical', "")[:3] == 'OVS': vlan = str(server_net['network']['provider:vlan']) 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) 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']) - vm_dhcp_ip = c2[0]["ip_address"] - config_dic['host_threads'][server['host_id']].insert_task("create-ovs-bridge-port", vlan) - 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)