X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_openvim%2Fhttpserver.py;h=d0d494a66ac8f5505fc4be841a6456bd2dcccb54;hb=e088f324b96f4a6aac702fb7e7871406f7156b0f;hp=edf1e8d9183e45ce8360a34ba43900bf091dd529;hpb=9f6571090b203922cabb0382226be0fa48d6e046;p=osm%2Fopenvim.git diff --git a/osm_openvim/httpserver.py b/osm_openvim/httpserver.py index edf1e8d..d0d494a 100644 --- a/osm_openvim/httpserver.py +++ b/osm_openvim/httpserver.py @@ -1645,7 +1645,7 @@ def http_post_server_id(tenant_id): 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']) + 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) @@ -1831,7 +1831,9 @@ def http_server_action(server_id, tenant_id, action): delete_dhcp_ovs_bridge(vlan, net_id) delete_mac_dhcp(vm_ip, vlan, mac) config_dic['host_threads'][server['host_id']].insert_task('del-ovs-port', vlan, net_id) - return format_out(data + warn_text) + if warn_text: + data["result"] += warn_text + return format_out(data)